bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx | 4 ++-- bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx | 5 ++--- bridges/source/cpp_uno/gcc3_ios_arm/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 5 ++--- bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx | 1 - bridges/source/cpp_uno/gcc3_linux_arm/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx | 1 - bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_intel/except.cxx | 5 ++--- bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx | 1 - bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_mips/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_s390/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx | 1 - bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx | 5 ++--- bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx | 6 ++---- bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx | 6 ++---- bridges/source/cpp_uno/mingw_intel/except.cxx | 6 ++---- bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx | 1 - bridges/source/cpp_uno/mingw_x86-64/except.cxx | 6 ++---- bridges/source/cpp_uno/msvc_win32_intel/except.cxx | 5 ++--- bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx | 5 ++--- bridges/source/cpp_uno/shared/vtablefactory.cxx | 4 ++-- bridges/source/jni_uno/jni_info.h | 4 ++-- 30 files changed, 50 insertions(+), 93 deletions(-)
New commits: commit ce7f442bd0b600c0acc74d4757e894a2ba382c53 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Jan 5 08:15:57 2015 +0000 boost::unordered_map->std::unordered_map Change-Id: I3a16703727f1a421e0ed18079e14219a4feeb8c8 diff --git a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx index 1e9a488..4216566 100644 --- a/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx +++ b/bridges/inc/bridges/cpp_uno/shared/vtablefactory.hxx @@ -26,7 +26,7 @@ #include "sal/types.h" #include "typelib/typedescription.hxx" -#include <boost/unordered_map.hpp> +#include <unordered_map> /*See: http://people.redhat.com/drepper/selinux-mem.html*/ #if defined(LINUX) || defined(OPENBSD) || defined(FREEBSD) \ @@ -207,7 +207,7 @@ private: static void flushCode( unsigned char const * begin, unsigned char const * end); - typedef boost::unordered_map< OUString, Vtables, OUStringHash > Map; + typedef std::unordered_map< OUString, Vtables, OUStringHash > Map; osl::Mutex m_mutex; Map m_map; diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx index 8d74357..2e22d92 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/except.cxx @@ -21,7 +21,6 @@ #include <stdio.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> @@ -30,7 +29,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" #include <string.h> @@ -89,7 +88,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx index d20bf42..8085445 100644 --- a/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_ios_arm/except.cxx @@ -22,8 +22,6 @@ #include <dlfcn.h> #include <boost/static_assert.hpp> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> @@ -35,7 +33,7 @@ #include <com/sun/star/ucb/NameClashException.hpp> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" using namespace ::osl; @@ -130,7 +128,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx index cdfaea2..1620467 100644 --- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx @@ -27,7 +27,6 @@ #include <cxxabi.h> #include <dlfcn.h> -#include <boost/unordered_map.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/genfunc.h> #include <rtl/strbuf.hxx> @@ -40,8 +39,8 @@ #include <uno/mapping.h> #include <abi.hxx> - #include <osl/mutex.hxx> +#include <unordered_map> namespace { @@ -82,7 +81,7 @@ public: std::type_info * getRtti(typelib_TypeDescription const & type); private: - typedef boost::unordered_map<OUString, std::type_info *, OUStringHash> Map; + typedef std::unordered_map<OUString, std::type_info *, OUStringHash> Map; void * app_; diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx index ddf2c06..bd7164c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/except.cxx @@ -22,8 +22,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> @@ -31,7 +29,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -87,7 +85,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx index 8bbbe03..0c77697 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/cpp2uno.cxx @@ -18,7 +18,6 @@ */ #include <malloc.h> -#include <boost/unordered_map.hpp> #include <rtl/alloc.h> #include <osl/mutex.hxx> diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx index 23ebca5..520c49f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/except.cxx @@ -21,8 +21,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> @@ -32,7 +30,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -89,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx index 95caf16..c664f28 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/cpp2uno.cxx @@ -18,7 +18,6 @@ */ #include <malloc.h> -#include <boost/unordered_map.hpp> #include <rtl/alloc.h> #include <osl/mutex.hxx> diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx index f982371..57808f9 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/except.cxx @@ -21,8 +21,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> @@ -32,7 +30,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -89,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx index 7495b64..76755f8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/except.cxx @@ -22,8 +22,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> @@ -31,7 +29,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -87,7 +85,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx index 47e570d..a6543c5 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/except.cxx @@ -20,7 +20,6 @@ #include <cstdio> #include <cstring> #include <dlfcn.h> -#include <boost/unordered_map.hpp> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> @@ -30,7 +29,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> - +#include <unordered_map> #include "share.hxx" using namespace ::std; @@ -85,7 +84,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx index f798735..18efddb 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/cpp2uno.cxx @@ -18,7 +18,6 @@ */ #include <malloc.h> -#include <boost/unordered_map.hpp> #include <rtl/alloc.h> #include <osl/mutex.hxx> diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx index 680c33a..13a8b8f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/except.cxx @@ -21,8 +21,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -32,7 +30,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -89,7 +87,7 @@ namespace CPPU_CURRENT_NAMESPACE class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx index 502d94d..419cae7 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/except.cxx @@ -20,8 +20,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -30,7 +28,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -86,7 +84,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx index fabab50..e70a5df 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/except.cxx @@ -22,7 +22,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> @@ -31,10 +30,9 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" - using namespace ::std; using namespace ::osl; using namespace ::com::sun::star::uno; @@ -87,7 +85,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx index 7495b64..76755f8 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/except.cxx @@ -22,8 +22,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> @@ -31,7 +29,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -87,7 +85,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx index ddf2c06..bd7164c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/except.cxx @@ -22,8 +22,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> @@ -31,7 +29,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -87,7 +85,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx index 92faed4..abf406c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/except.cxx @@ -22,8 +22,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> @@ -31,7 +29,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -87,7 +85,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx index 7fc8974..cb50f35 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/except.cxx @@ -21,8 +21,6 @@ #include <string.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -31,7 +29,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -87,7 +85,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx index 663a663..e0e76ca 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/cpp2uno.cxx @@ -20,7 +20,6 @@ #include <stdio.h> #include <stdlib.h> -#include <boost/unordered_map.hpp> #include <rtl/alloc.h> #include <osl/mutex.hxx> diff --git a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx index 4814a24..b1e40bd 100644 --- a/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx +++ b/bridges/source/cpp_uno/gcc3_macosx_x86-64/except.cxx @@ -28,7 +28,6 @@ #include <dlfcn.h> #include "boost/static_assert.hpp" -#include "boost/unordered_map.hpp" #include "com/sun/star/uno/RuntimeException.hpp" #include "com/sun/star/uno/genfunc.hxx" #include <sal/log.hxx> @@ -37,7 +36,7 @@ #include "rtl/ustrbuf.hxx" #include "typelib/typedescription.h" #include "uno/any2.h" - +#include <unordered_map> #include "share.hxx" using namespace ::osl; @@ -144,7 +143,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, std::type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx index 153e0c3..946f105 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/except.cxx @@ -22,8 +22,6 @@ #include <strings.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -33,7 +31,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -89,7 +87,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx index 0973b46..20a4907 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/except.cxx @@ -20,8 +20,6 @@ #include <stdio.h> #include <dlfcn.h> #include <cxxabi.h> -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -30,7 +28,7 @@ #include <com/sun/star/uno/genfunc.hxx> #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -86,7 +84,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/mingw_intel/except.cxx b/bridges/source/cpp_uno/mingw_intel/except.cxx index af50e5c..aabc8a0 100644 --- a/bridges/source/cpp_uno/mingw_intel/except.cxx +++ b/bridges/source/cpp_uno/mingw_intel/except.cxx @@ -26,8 +26,6 @@ #define _GLIBCXX_CDTOR_CALLABI #endif -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -37,7 +35,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -93,7 +91,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx index b18c614..dcbf8fe 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/cpp2uno.cxx @@ -20,7 +20,6 @@ #include <stdio.h> #include <stdlib.h> -#include <boost/unordered_map.hpp> #include <rtl/alloc.h> #include <osl/mutex.hxx> diff --git a/bridges/source/cpp_uno/mingw_x86-64/except.cxx b/bridges/source/cpp_uno/mingw_x86-64/except.cxx index af50e5c..aabc8a0 100644 --- a/bridges/source/cpp_uno/mingw_x86-64/except.cxx +++ b/bridges/source/cpp_uno/mingw_x86-64/except.cxx @@ -26,8 +26,6 @@ #define _GLIBCXX_CDTOR_CALLABI #endif -#include <boost/unordered_map.hpp> - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> @@ -37,7 +35,7 @@ #include "com/sun/star/uno/RuntimeException.hpp" #include <typelib/typedescription.hxx> #include <uno/any2.h> - +#include <unordered_map> #include "share.hxx" @@ -93,7 +91,7 @@ static OUString toUNOname( char const * p ) class RTTI { - typedef boost::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; + typedef std::unordered_map< OUString, type_info *, OUStringHash > t_rtti_map; Mutex m_mutex; t_rtti_map m_rttis; diff --git a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx index 57415cd..903346a0 100644 --- a/bridges/source/cpp_uno/msvc_win32_intel/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_intel/except.cxx @@ -19,7 +19,6 @@ #pragma warning( disable : 4237 ) -#include <boost/unordered_map.hpp> #include <sal/config.h> #include <malloc.h> #include <typeinfo.h> @@ -31,7 +30,7 @@ #include <sal/log.hxx> #include "com/sun/star/uno/Any.hxx" - +#include <unordered_map> #include "msci.hxx" @@ -82,7 +81,7 @@ static inline OUString toRTTIname( OUString const & rUNOname ) throw () //#### RTTI simulation ############################################################################# -typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap; +typedef std::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap; class RTTInfos { diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx index d3e1e48..28cab11 100644 --- a/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx +++ b/bridges/source/cpp_uno/msvc_win32_x86-64/except.cxx @@ -235,7 +235,6 @@ void #pragma warning( disable : 4237 ) -#include <boost/unordered_map.hpp> #include <sal/config.h> #include <malloc.h> #include <new.h> @@ -248,7 +247,7 @@ void #include <sal/log.hxx> #include "com/sun/star/uno/Any.hxx" - +#include <unordered_map> #include "mscx.hxx" #pragma pack(push, 8) @@ -302,7 +301,7 @@ static inline OUString toRTTIname( //RTTI simulation -typedef boost::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap; +typedef std::unordered_map< OUString, void *, OUStringHash, equal_to< OUString > > t_string2PtrMap; class __type_info_descriptor; class RTTInfos diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index 2e2d74c..ca77aea 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -35,8 +35,8 @@ #include "typelib/typedescription.hxx" #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> #include <new> +#include <unordered_map> #include <vector> #if defined SAL_UNX @@ -153,7 +153,7 @@ private: sal_Int32 calculate( typelib_InterfaceTypeDescription * type, sal_Int32 offset); - typedef boost::unordered_map< OUString, sal_Int32, OUStringHash > Map; + typedef std::unordered_map< OUString, sal_Int32, OUStringHash > Map; Map m_map; }; diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index e38c4b3..1e5b4e8 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -23,7 +23,7 @@ #include <sal/config.h> #include <boost/noncopyable.hpp> -#include <boost/unordered_map.hpp> +#include <unordered_map> #include "jni_base.h" @@ -114,7 +114,7 @@ struct JNI_type_info_holder: private boost::noncopyable {} }; -typedef ::boost::unordered_map< +typedef std::unordered_map< OUString, JNI_type_info_holder, OUStringHash > t_str2type; class JNI_info: private boost::noncopyable
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits