[Libreoffice-commits] .: 3 commits - cppuhelper/source cppu/source rdbmaker/inc
Fridrich Strba
fridrich at kemper.freedesktop.org
Thu Feb 3 14:39:52 PST 2011
cppu/source/LogBridge/LogBridge.cxx | 2 +-
cppu/source/threadpool/threadpool.cxx | 4 ++--
cppu/source/threadpool/threadpool.hxx | 4 ++--
cppu/source/typelib/typelib.cxx | 4 ++--
cppu/source/uno/EnvStack.cxx | 4 ++--
cppu/source/uno/lbenv.cxx | 8 ++++----
cppu/source/uno/lbmap.cxx | 6 +++---
cppuhelper/source/component_context.cxx | 5 ++---
cppuhelper/source/interfacecontainer.cxx | 2 +-
rdbmaker/inc/codemaker/dependency.hxx | 27 +++------------------------
rdbmaker/inc/codemaker/options.hxx | 15 ++-------------
rdbmaker/inc/codemaker/typemanager.hxx | 15 ++-------------
12 files changed, 26 insertions(+), 70 deletions(-)
New commits:
commit b06268d0a94b590bde6c94622a6cbb63e5e183ef
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Feb 3 15:36:13 2011 -0700
move module rdbmaker to boost unordered containers
diff --git a/rdbmaker/inc/codemaker/dependency.hxx b/rdbmaker/inc/codemaker/dependency.hxx
index 1bb496e..11d80df 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 bcf171b..f0e5462 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 d19e447..9e231eb 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
{
commit 31ba2d1ea309630d108e4cef4b4ccb45abe12447
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Feb 3 15:26:41 2011 -0700
move module cppuhelper to boost unordered containers
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index b489c8e..1fe9860 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -38,7 +38,7 @@
#endif
#include <vector>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#ifdef CONTEXT_DIAG
#include <map>
#endif
@@ -64,7 +64,6 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include "com/sun/star/uno/RuntimeException.hpp"
-#include <hash_map>
#include <memory>
#define SMGR_SINGLETON "/singletons/com.sun.star.lang.theServiceManager"
@@ -363,7 +362,7 @@ protected:
, lateInit( lateInit_ )
{}
};
- typedef ::std::hash_map< OUString, ContextEntry * , OUStringHash > t_map;
+ typedef ::boost::unordered_map< OUString, ContextEntry * , OUStringHash > t_map;
t_map m_map;
Reference< lang::XMultiComponentFactory > m_xSMgr;
diff --git a/cppuhelper/source/interfacecontainer.cxx b/cppuhelper/source/interfacecontainer.cxx
index 18e10a7..2d642d5 100644
--- a/cppuhelper/source/interfacecontainer.cxx
+++ b/cppuhelper/source/interfacecontainer.cxx
@@ -36,7 +36,7 @@
#include <osl/diagnose.h>
#include <osl/mutex.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <com/sun/star/lang/XEventListener.hpp>
commit d0958219679151caef2f1b27998f2004147d9c1d
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date: Thu Feb 3 15:22:22 2011 -0700
move module cppu to boost unordered containers
diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx
index 2fbe515..a290144 100644
--- a/cppu/source/LogBridge/LogBridge.cxx
+++ b/cppu/source/LogBridge/LogBridge.cxx
@@ -39,7 +39,7 @@
#include "rtl/logfile.hxx"
#include "uno/environment.hxx"
#include <com/sun/star/uno/Type.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <memory>
namespace
diff --git a/cppu/source/threadpool/threadpool.cxx b/cppu/source/threadpool/threadpool.cxx
index 42dd870..cdd2776 100644
--- a/cppu/source/threadpool/threadpool.cxx
+++ b/cppu/source/threadpool/threadpool.cxx
@@ -28,7 +28,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_cppu.hxx"
-#include <hash_set>
+#include <boost/unordered_map.hpp>
#include <stdio.h>
#include <osl/diagnose.h>
@@ -405,7 +405,7 @@ struct uno_ThreadPool_Hash
-typedef ::std::hash_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
+typedef ::boost::unordered_map< uno_ThreadPool, ThreadPoolHolder, uno_ThreadPool_Hash, uno_ThreadPool_Equal > ThreadpoolHashSet;
static ThreadpoolHashSet *g_pThreadpoolHashSet;
diff --git a/cppu/source/threadpool/threadpool.hxx b/cppu/source/threadpool/threadpool.hxx
index db84909..3de9249 100644
--- a/cppu/source/threadpool/threadpool.hxx
+++ b/cppu/source/threadpool/threadpool.hxx
@@ -25,7 +25,7 @@
* for a copy of the LGPLv3 License.
*
************************************************************************/
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <osl/conditn.h>
@@ -60,7 +60,7 @@ namespace cppu_threadpool {
}
};
- typedef ::std::hash_map
+ typedef ::boost::unordered_map
<
ByteSequence, // ThreadID
::std::pair < JobQueue * , JobQueue * >,
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx
index 4e22da6..488e98f 100644
--- a/cppu/source/typelib/typelib.cxx
+++ b/cppu/source/typelib/typelib.cxx
@@ -33,7 +33,7 @@
#include <stdio.h>
#endif
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <list>
#include <set>
#include <vector>
@@ -192,7 +192,7 @@ struct hashStr_Impl
//-----------------------------------------------------------------------------
// Heavy hack, the const sal_Unicode * is hold by the typedescription reference
-typedef hash_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
+typedef boost::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *,
hashStr_Impl, equalStr_Impl > WeakMap_Impl;
typedef pair< void *, typelib_typedescription_Callback > CallbackEntry;
diff --git a/cppu/source/uno/EnvStack.cxx b/cppu/source/uno/EnvStack.cxx
index 99322eb..c96d307 100644
--- a/cppu/source/uno/EnvStack.cxx
+++ b/cppu/source/uno/EnvStack.cxx
@@ -36,7 +36,7 @@
#include "osl/thread.h"
#include "osl/mutex.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
using namespace com::sun::star;
@@ -65,7 +65,7 @@ size_t oslThreadIdentifier_hash::operator()(oslThreadIdentifier s1) const
return s1;
}
-typedef ::std::hash_map<oslThreadIdentifier,
+typedef ::boost::unordered_map<oslThreadIdentifier,
uno_Environment *,
oslThreadIdentifier_hash,
oslThreadIdentifier_equal> ThreadMap;
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 5599910..edadca2 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -51,7 +51,7 @@
#include "destr.hxx"
#include "loadmodule.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <vector>
#include <stdio.h>
@@ -120,16 +120,16 @@ struct FctOUStringHash :
};
// mapping from environment name to environment
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
OUString, uno_Environment *, FctOUStringHash,
::std::equal_to< OUString > > OUString2EnvironmentMap;
// mapping from ptr to object entry
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
void *, ObjectEntry *, FctPtrHash,
::std::equal_to< void * > > Ptr2ObjectMap;
// mapping from oid to object entry
-typedef ::std::hash_map<
+typedef ::boost::unordered_map<
OUString, ObjectEntry *, FctOUStringHash,
::std::equal_to< OUString > > OId2ObjectMap;
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index 4060c72..a701e1a 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -31,7 +31,7 @@
#include "IdentityMapping.hxx"
-#include <hash_map>
+#include <boost/unordered_map.hpp>
#include <set>
#include <algorithm>
@@ -142,9 +142,9 @@ struct FctPtrHash : public std::unary_function< uno_Mapping *, size_t >
{ return (size_t)pKey; }
};
-typedef hash_map<
+typedef boost::unordered_map<
OUString, MappingEntry *, FctOUStringHash, equal_to< OUString > > t_OUString2Entry;
-typedef hash_map<
+typedef boost::unordered_map<
uno_Mapping *, MappingEntry *, FctPtrHash, equal_to< uno_Mapping * > > t_Mapping2Entry;
typedef set< uno_getMappingFunc > t_CallbackSet;
More information about the Libreoffice-commits
mailing list