Modified: openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx?rev=1550447&r1=1550446&r2=1550447&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx (original) +++ openoffice/branches/rejuvenate01/main/binaryurp/source/cache.hxx Thu Dec 12 16:29:00 2013 @@ -94,7 +94,7 @@ private: #ifdef URPCACHE_USES_UNORDERED_MAP struct HashT{ size_t operator()( const LruListIt& rA) const { return hash(*rA;);}; struct EqualT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return *rA==*rB;}}; - typedef ::std::hash_map< LruListIt, IdxType, HashT, EqualT > LruItMap; // a map into a LruList + typedef ::std::unordered_map< LruListIt, IdxType, HashT, EqualT > LruItMap; // a map into a LruList #else struct CmpT{ bool operator()( const LruListIt& rA, const LruListIt& rB) const { return (*rA<*rB);}}; typedef ::std::map< LruListIt, IdxType, CmpT > LruItMap; // a map into a LruList
Modified: openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx?rev=1550447&r1=1550446&r2=1550447&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx (original) +++ openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/except.cxx Thu Dec 12 16:29:00 2013 @@ -213,8 +213,6 @@ type_info * RTTI::getRTTI( typelib_Compo static void deleteException( void * pExc ) { __cxa_exception const * header = ((__cxa_exception const *)pExc - 1); - if( !header->exceptionType) // TODO: remove this when getRTTI() always returns non-NULL - return; // NOTE: leak for now typelib_TypeDescription * pTD = 0; OUString unoName( toUNOname( header->exceptionType->name() ) ); ::typelib_typedescription_getByName( &pTD, unoName.pData ); Modified: openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx?rev=1550447&r1=1550446&r2=1550447&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx (original) +++ openoffice/branches/rejuvenate01/main/bridges/source/cpp_uno/s5abi_macosx_x86-64/share.hxx Thu Dec 12 16:29:00 2013 @@ -40,7 +40,7 @@ struct _Unwind_Exception void * exception_cleanup; uintptr_t private_1; uintptr_t private_2; -} __attribute__((__aligned__)); +}; struct __cxa_exception { Modified: openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map?rev=1550447&r1=1550446&r2=1550447&view=diff ============================================================================== --- openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map (original) +++ openoffice/branches/rejuvenate01/main/cppu/util/uno_purpenvhelpers5abi.map Thu Dec 12 16:29:00 2013 @@ -7,17 +7,18 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -# +# ############################################################### + UDK_3_0_0 { global: _ZN4cppu6helper7purpenv13createMappingEPP12_uno_MappingP16_uno_EnvironmentS6_PFvbPvS7_P33_typelib_TypeDescriptionReferenceP24_typelib_MethodParameter?PK24_typelib_TypeDescriptionS7_PS7_PP8_uno_AnyES7_; @@ -26,3 +27,4 @@ UDK_3_0_0 { local: *; }; +
