diff options
author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2011-02-03 14:46:02 -0700 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-03 22:48:54 +0100 |
commit | 8554daf5cdfb3339c55c095f44d9f40c8cf9bad3 (patch) | |
tree | a458b9625f7eff6fb2ecc3da045fae59bc2fdf83 /codemaker | |
parent | f8e27a7c4629a6487a0047a7bd32bf5f171e4d9b (diff) |
move codemaker module to the boost unordered containers
Diffstat (limited to 'codemaker')
-rw-r--r-- | codemaker/inc/codemaker/dependencies.hxx | 4 | ||||
-rw-r--r-- | codemaker/inc/codemaker/generatedtypeset.hxx | 4 | ||||
-rw-r--r-- | codemaker/inc/codemaker/options.hxx | 15 | ||||
-rw-r--r-- | codemaker/inc/codemaker/typemanager.hxx | 15 |
4 files changed, 8 insertions, 30 deletions
diff --git a/codemaker/inc/codemaker/dependencies.hxx b/codemaker/inc/codemaker/dependencies.hxx index 0e6bc90197f0..07989f59ef01 100644 --- a/codemaker/inc/codemaker/dependencies.hxx +++ b/codemaker/inc/codemaker/dependencies.hxx @@ -31,7 +31,7 @@ #include "rtl/string.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> namespace rtl { class OUString; } class TypeManager; @@ -53,7 +53,7 @@ public: */ enum Kind { KIND_NO_BASE, KIND_BASE }; - typedef std::hash_map< rtl::OString, Kind, rtl::OStringHash > Map; + typedef boost::unordered_map< rtl::OString, Kind, rtl::OStringHash > Map; /** Constructs the dependencies for a given type. diff --git a/codemaker/inc/codemaker/generatedtypeset.hxx b/codemaker/inc/codemaker/generatedtypeset.hxx index 7740847c273a..6829d0cd5bd7 100644 --- a/codemaker/inc/codemaker/generatedtypeset.hxx +++ b/codemaker/inc/codemaker/generatedtypeset.hxx @@ -31,7 +31,7 @@ #include "rtl/string.hxx" -#include <hash_set> +#include <boost/unordered_set.hpp> /// @HTML @@ -72,7 +72,7 @@ private: GeneratedTypeSet(GeneratedTypeSet &); // not implemented void operator =(GeneratedTypeSet); // not implemented - std::hash_set< rtl::OString, rtl::OStringHash > m_set; + boost::unordered_set< rtl::OString, rtl::OStringHash > m_set; }; } diff --git a/codemaker/inc/codemaker/options.hxx b/codemaker/inc/codemaker/options.hxx index d443d35d2c1a..76c3328668f3 100644 --- a/codemaker/inc/codemaker/options.hxx +++ b/codemaker/inc/codemaker/options.hxx @@ -29,28 +29,17 @@ #ifndef INCLUDED_CODEMAKER_OPTIONS_HXX #define INCLUDED_CODEMAKER_OPTIONS_HXX -#include <hash_map> +#include <boost/unordered_map.hpp> #include <codemaker/global.hxx> -#if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) -typedef ::std::__hash_map__ -< - ::rtl::OString, - ::rtl::OString, - HashString, - EqualString, - NewAlloc -> OptionMap; -#else -typedef ::std::hash_map +typedef ::boost::unordered_map < ::rtl::OString, ::rtl::OString, HashString, EqualString > OptionMap; -#endif class IllegalArgument { diff --git a/codemaker/inc/codemaker/typemanager.hxx b/codemaker/inc/codemaker/typemanager.hxx index 8927e9080932..129dbfe69898 100644 --- a/codemaker/inc/codemaker/typemanager.hxx +++ b/codemaker/inc/codemaker/typemanager.hxx @@ -33,7 +33,7 @@ #include "registry/registry.hxx" #include "registry/types.h" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <list> namespace typereg { class Reader; } @@ -43,24 +43,13 @@ typedef ::std::vector< Registry* > RegistryList; typedef ::std::pair< RegistryKey, sal_Bool > KeyPair; typedef ::std::vector< KeyPair > RegistryKeyList; -#if defined( _MSC_VER ) && ( _MSC_VER < 1200 ) -typedef ::std::__hash_map__ -< - ::rtl::OString, // Typename - RTTypeClass, // TypeClass - HashString, - EqualString, - NewAlloc -> T2TypeClassMap; -#else -typedef ::std::hash_map +typedef ::boost::unordered_map < ::rtl::OString, // Typename RTTypeClass, // TypeClass HashString, EqualString > T2TypeClassMap; -#endif struct TypeManagerImpl { |