From 611447a4b35288284350033930c441ff185e3cba Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fridrich.strba@bluewin.ch>
Date: Thu, 3 Feb 2011 14:46:02 -0700
Subject: move codemaker module to the boost unordered containers

---
 codemaker/inc/codemaker/dependencies.hxx     |  4 ++--
 codemaker/inc/codemaker/generatedtypeset.hxx |  4 ++--
 codemaker/inc/codemaker/options.hxx          | 15 ++-------------
 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 681901175..ad898f556 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 a290bb7cf..827e30522 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 421cc217a..a9afe9934 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 49a6e0a49..9e5a74211 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
 {
-- 
cgit v1.2.3