configure.in | 10 ++-------- cppu/source/uno/lbenv.cxx | 4 ++++ stoc/source/invocation_adapterfactory/iafactory.cxx | 2 ++ 3 files changed, 8 insertions(+), 8 deletions(-)
New commits: commit 4b5f1d7b2d095e4b41434658b376b6de422bf573 Author: Tor Lillqvist <[email protected]> Date: Mon Jul 23 14:51:53 2012 +0300 WaE: unused variable Change-Id: Ie355701716c7106ef2afd76ae8b6544a00ac474c diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx index 377b20b..ef37aee 100644 --- a/cppu/source/uno/lbenv.cxx +++ b/cppu/source/uno/lbenv.cxx @@ -190,6 +190,10 @@ inline void ObjectEntry::append( ::std::pair< Ptr2ObjectMap::iterator, bool > insertion( pEnv->aPtr2ObjectMap.insert( Ptr2ObjectMap::value_type( pInterface, this ) ) ); + // No idea if the code above has side-effects and can't be just + // bypassed in the no-OSL_ASSERT case, so avoid "unused variable" like this instead. + (void) insertion; + OSL_ASSERT( insertion.second || (find( pInterface, 0 ) >= 0 && // points to the same object entry: diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 02f715b..72a880a 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -863,6 +863,8 @@ Reference< XInterface > FactoryImpl::createAdapter( { pair< t_ptr_set::iterator, bool > insertion( adapter_set->insert( pNew ) ); + // Avoid unused variable warning + (void) insertion; OSL_ASSERT( insertion.second ); that = pNew; } commit 9d1263d108244c172e682624557ca4d23ddfcd10 Author: Tor Lillqvist <[email protected]> Date: Mon Jul 16 21:40:11 2012 +0300 Use xcode-select -print-path for 10.6 and 10.7 SDKs Change-Id: I79d71c682c07f49b70c6791953c000868bf65cd9 diff --git a/configure.in b/configure.in index 7a0ec39..783520f 100644 --- a/configure.in +++ b/configure.in @@ -2443,19 +2443,13 @@ if test "$_os" = "Darwin"; then echo "Building with a SDK > 10.4 is experimental" >> warn ;; 10.6) - MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.6.sdk" - if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk - fi + MACOSX_SDK_PATH="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk" macosx_sdk_value="1060" AC_MSG_WARN([Building with a SDK > 10.4 is experimental]) echo "Building with a SDK > 10.4 is experimental" >> warn ;; 10.7) - MACOSX_SDK_PATH="/Developer/SDKs/MacOSX10.7.sdk" - if test ! -d "$MACOSX_SDK_PATH"; then - MACOSX_SDK_PATH=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk - fi + MACOSX_SDK_PATH="`xcode-select -print-path`/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk" macosx_sdk_value="1070" AC_MSG_WARN([Building with SDK 10.7 is known to fail in vcl]) echo "Building with SDK 10.7 is known to fail in vcl" >> warn _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
