bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx | 9 +++++---- clucene/CustomTarget_source.mk | 2 ++ cppu/source/uno/lbenv.cxx | 6 +++--- 3 files changed, 10 insertions(+), 7 deletions(-)
New commits: commit 728351a1bb286e9e7c9f1c9a5e4e032fe13ba408 Author: Catalin Iacob <iacobcata...@gmail.com> Date: Tue Apr 24 23:22:09 2012 +0200 Mention that the CLucene patch was also sent upstream diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk index 55e5d24..bf97af2 100644 --- a/clucene/CustomTarget_source.mk +++ b/clucene/CustomTarget_source.mk @@ -67,6 +67,8 @@ $(CLSO)/done : $(cl_FIXED_TARFILE_LOCATION) \ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-debug.patch && \ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-narrowing-conversions.patch && \ $(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-multimap-put.patch && \ + #clucene-multimap-put.patch was proposed upstream + #see http://sourceforge.net/mailarchive/message.php?msg_id=29143260 for i in `find $(CLSO)/ -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done) #FIXME ?, our rules expect .cxx ifneq ($(OS),WNT) commit 08a38341e0a800cfb643591130afd8984d03fe22 Author: Catalin Iacob <iacobcata...@gmail.com> Date: Sun Mar 25 17:28:33 2012 +0200 WaE: Clang unused variable diff --git a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx index 8373d14..648a09e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_x86-64/except.cxx @@ -38,6 +38,7 @@ #include <boost/unordered_map.hpp> +#include <sal/log.hxx> #include <rtl/instance.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> @@ -166,9 +167,9 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR if (rtti) { - pair< t_rtti_map::iterator, bool > insertion( + pair< t_rtti_map::iterator, bool > insertion ( m_rttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); - OSL_ENSURE( insertion.second, "### inserting new rtti failed?!" ); + SAL_WARN_IF( !insertion.second, "bridges", "key " << unoName << " already in rtti map" ); } else { @@ -197,9 +198,9 @@ type_info * RTTI::getRTTI( typelib_CompoundTypeDescription *pTypeDescr ) SAL_THR rtti = new __class_type_info( strdup( rttiName ) ); } - pair< t_rtti_map::iterator, bool > insertion( + pair< t_rtti_map::iterator, bool > insertion ( m_generatedRttis.insert( t_rtti_map::value_type( unoName, rtti ) ) ); - OSL_ENSURE( insertion.second, "### inserting new generated rtti failed?!" ); + SAL_WARN_IF( !insertion.second, "bridges", "key " << unoName << " already in generated rtti map" ); } else // taking already generated rtti { commit fd0790a219041d1cc62ea1a5417d90e0df206662 Author: Catalin Iacob <iacobcata...@gmail.com> Date: Sun Mar 25 17:23:22 2012 +0200 WaE: Clang unused variable diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 47ca98f..b8a802b 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -30,6 +30,7 @@ #include "cppu/EnvDcp.hxx" #include "sal/alloca.h" +#include "sal/log.hxx" #include "osl/diagnose.h" #include "osl/interlck.h" #include "osl/mutex.hxx" @@ -987,11 +988,10 @@ inline void EnvironmentsData::registerEnvironment( uno_Environment ** ppEnv ) if (iFind == aName2EnvMap.end()) { (*pEnv->acquireWeak)( pEnv ); - ::std::pair< OUString2EnvironmentMap::iterator, bool > insertion( + ::std::pair< OUString2EnvironmentMap::iterator, bool > insertion ( aName2EnvMap.insert( OUString2EnvironmentMap::value_type( aKey, pEnv ) ) ); - OSL_ENSURE( - insertion.second, "### insertion of env into map failed?!" ); + SAL_WARN_IF( !insertion.second, "cppu", "key " << aKey << " already in env map" ); } else { _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits