summaryrefslogtreecommitdiff
path: root/rdbmaker
diff options
context:
space:
mode:
authorFridrich Strba <fridrich.strba@bluewin.ch>2011-02-03 15:36:13 -0700
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-02-03 23:39:38 +0100
commite309a0b2ac0ff4815f2fe51714e737d90c3e1ca0 (patch)
tree926ce6556536ba8ebc7cc86a8166c4a3b3f2bd04 /rdbmaker
parent789556321603077e6fc8ee9036f78f9eb941d8ba (diff)
move module rdbmaker to boost unordered containers
Diffstat (limited to 'rdbmaker')
-rw-r--r--rdbmaker/inc/codemaker/dependency.hxx27
-rw-r--r--rdbmaker/inc/codemaker/options.hxx15
-rw-r--r--rdbmaker/inc/codemaker/typemanager.hxx15
3 files changed, 7 insertions, 50 deletions
diff --git a/rdbmaker/inc/codemaker/dependency.hxx b/rdbmaker/inc/codemaker/dependency.hxx
index bada8239de73..1f80faee6b95 100644
--- a/rdbmaker/inc/codemaker/dependency.hxx
+++ b/rdbmaker/inc/codemaker/dependency.hxx
@@ -29,7 +29,7 @@
#ifndef _CODEMAKER_DEPENDENCY_HXX_
#define _CODEMAKER_DEPENDENCY_HXX_
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <registry/registry.hxx>
#include <registry/reflread.hxx>
#include <codemaker/typemanager.hxx>
@@ -80,26 +80,7 @@ struct LessTypeUsing
typedef ::std::set< TypeUsing, LessTypeUsing > TypeUsingSet;
-#if (defined( _MSC_VER ) && ( _MSC_VER < 1200 ))
-typedef ::std::__hash_map__
-<
- ::rtl::OString,
- TypeUsingSet,
- HashString,
- EqualString,
- NewAlloc
-> DependencyMap;
-
-typedef ::std::__hash_map__
-<
- ::rtl::OString,
- sal_uInt16,
- HashString,
- EqualString,
- NewAlloc
-> GenerationMap;
-#else
-typedef ::std::hash_map
+typedef ::boost::unordered_map
<
::rtl::OString,
TypeUsingSet,
@@ -107,7 +88,7 @@ typedef ::std::hash_map
EqualString
> DependencyMap;
-typedef ::std::hash_map
+typedef ::boost::unordered_map
<
::rtl::OString,
sal_uInt16,
@@ -115,8 +96,6 @@ typedef ::std::hash_map
EqualString
> GenerationMap;
-#endif
-
struct TypeDependencyImpl
{
TypeDependencyImpl()
diff --git a/rdbmaker/inc/codemaker/options.hxx b/rdbmaker/inc/codemaker/options.hxx
index 05cfcfc64265..b2e504923e7e 100644
--- a/rdbmaker/inc/codemaker/options.hxx
+++ b/rdbmaker/inc/codemaker/options.hxx
@@ -29,27 +29,16 @@
#ifndef _CODEMAKER_OPTIONS_HXX_
#define _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 CannotDumpException
{
diff --git a/rdbmaker/inc/codemaker/typemanager.hxx b/rdbmaker/inc/codemaker/typemanager.hxx
index 2abfeacedc78..b651e9baa0ca 100644
--- a/rdbmaker/inc/codemaker/typemanager.hxx
+++ b/rdbmaker/inc/codemaker/typemanager.hxx
@@ -25,7 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#ifndef _CODEMAKER_TYPEMANAGER_HXX_
#define _CODEMAKER_TYPEMANAGER_HXX_
@@ -33,24 +33,13 @@
typedef ::std::list< Registry* > RegistryList;
-#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
{