summaryrefslogtreecommitdiff
path: root/stoc
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-01-04 11:10:45 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-01-04 12:51:09 +0000
commitca8787a98171070c771dc167b43d5bdb98c52ce4 (patch)
tree44e476f42d84e50a406698b78f8c72b3afbdebd2 /stoc
parent18861c30a63dd419f3be47896a760109ac06c47a (diff)
boost::unordered_map->std::unordered_map
Change-Id: I5d458f43616edc395faa8c27edaddc7d515166db
Diffstat (limited to 'stoc')
-rw-r--r--stoc/source/corereflection/base.hxx6
-rw-r--r--stoc/source/corereflection/lrucache.hxx4
-rw-r--r--stoc/source/inspect/introspection.cxx6
-rw-r--r--stoc/source/invocation_adapterfactory/iafactory.cxx11
-rw-r--r--stoc/source/namingservice/namingservice.cxx5
-rw-r--r--stoc/source/security/file_policy.cxx6
-rw-r--r--stoc/source/security/lru_cache.h4
-rw-r--r--stoc/source/servicemanager/servicemanager.cxx13
8 files changed, 28 insertions, 27 deletions
diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx
index f49eb74bf6a5..08bba8fa8fd9 100644
--- a/stoc/source/corereflection/base.hxx
+++ b/stoc/source/corereflection/base.hxx
@@ -37,7 +37,7 @@
#include <list>
#include <algorithm>
#endif
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -77,9 +77,9 @@ inline typelib_TypeDescription * getTypeByName( const OUString & rName )
return pTypeDescr;
}
-typedef boost::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlField >,
+typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlField >,
OUStringHash > OUString2Field;
-typedef boost::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlMethod >,
+typedef std::unordered_map< OUString, css::uno::WeakReference< css::reflection::XIdlMethod >,
OUStringHash > OUString2Method;
diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx
index 67f351b21033..7fbcb9db93e7 100644
--- a/stoc/source/corereflection/lrucache.hxx
+++ b/stoc/source/corereflection/lrucache.hxx
@@ -26,7 +26,7 @@
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
/** Implementation of a least recently used (lru) cache.
<br>
@@ -42,7 +42,7 @@ class LRU_Cache
CacheEntry * pPred;
CacheEntry * pSucc;
};
- typedef ::boost::unordered_map< t_Key, CacheEntry *, t_KeyHash > t_Key2Element;
+ typedef std::unordered_map< t_Key, CacheEntry *, t_KeyHash > t_Key2Element;
mutable ::osl::Mutex _aCacheMutex;
sal_Int32 _nCachedElements;
diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx
index bd7619768228..9869b4c6bd05 100644
--- a/stoc/source/inspect/introspection.cxx
+++ b/stoc/source/inspect/introspection.cxx
@@ -65,7 +65,7 @@
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
#include <rtl/strbuf.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace css::uno;
using namespace css::lang;
@@ -136,7 +136,7 @@ bool isDerivedFrom( Reference<XIdlClass> xToTestClass, Reference<XIdlClass> xDer
// part of the new Instance-related ImplIntrospectionAccess
// Hashtable for the search of names
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
sal_Int32,
@@ -147,7 +147,7 @@ IntrospectionNameMap;
// Hashtable to assign exact names to the Lower-Case
// converted names, for the support of XExactName
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
OUString,
diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx
index c3bdf2f8dcc5..3e5b391f365f 100644
--- a/stoc/source/invocation_adapterfactory/iafactory.cxx
+++ b/stoc/source/invocation_adapterfactory/iafactory.cxx
@@ -18,9 +18,6 @@
*/
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
-
#include <osl/diagnose.h>
#include <osl/interlck.h>
#include <osl/mutex.hxx>
@@ -48,8 +45,10 @@
#include <com/sun/star/reflection/InvocationTargetException.hpp>
#include <com/sun/star/uno/RuntimeException.hpp>
-#define IMPLNAME "com.sun.star.comp.stoc.InvocationAdapterFactory"
+#include <unordered_map>
+#include <unordered_set>
+#define IMPLNAME "com.sun.star.comp.stoc.InvocationAdapterFactory"
using namespace ::std;
using namespace ::osl;
@@ -76,8 +75,8 @@ struct hash_ptr
inline size_t operator() ( void * p ) const
{ return reinterpret_cast<size_t>(p); }
};
-typedef boost::unordered_set< void *, hash_ptr, equal_to< void * > > t_ptr_set;
-typedef boost::unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map;
+typedef std::unordered_set< void *, hash_ptr, equal_to< void * > > t_ptr_set;
+typedef std::unordered_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map;
class FactoryImpl
diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx
index b0b016a87c03..46b073cc2f71 100644
--- a/stoc/source/namingservice/namingservice.cxx
+++ b/stoc/source/namingservice/namingservice.cxx
@@ -18,7 +18,6 @@
*/
-#include <boost/unordered_map.hpp>
#include <osl/mutex.hxx>
#include <osl/diagnose.h>
#include <uno/dispatcher.h>
@@ -34,6 +33,8 @@
#include <com/sun/star/uno/XNamingService.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <unordered_map>
+
using namespace cppu;
using namespace osl;
using namespace std;
@@ -61,7 +62,7 @@ static OUString ns_getImplementationName()
return OUString(IMPLNAME);
}
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
Reference<XInterface >,
diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx
index b26806f544eb..fdbb5fc8dfaf 100644
--- a/stoc/source/security/file_policy.cxx
+++ b/stoc/source/security/file_policy.cxx
@@ -18,8 +18,6 @@
*/
-#include <boost/unordered_map.hpp>
-
#include <osl/diagnose.h>
#include <osl/file.h>
#include <rtl/byteseq.hxx>
@@ -39,6 +37,8 @@
#include <com/sun/star/io/FilePermission.hpp>
#include <com/sun/star/connection/SocketPermission.hpp>
+#include <unordered_map>
+
#define IMPL_NAME "com.sun.star.security.comp.stoc.FilePolicy"
using namespace ::osl;
@@ -63,7 +63,7 @@ class FilePolicy
AccessControl m_ac;
Sequence< Any > m_defaultPermissions;
- typedef boost::unordered_map< OUString, Sequence< Any >, OUStringHash > t_permissions;
+ typedef std::unordered_map< OUString, Sequence< Any >, OUStringHash > t_permissions;
t_permissions m_userPermissions;
bool m_init;
diff --git a/stoc/source/security/lru_cache.h b/stoc/source/security/lru_cache.h
index 4688dc9b3278..4a40792df073 100644
--- a/stoc/source/security/lru_cache.h
+++ b/stoc/source/security/lru_cache.h
@@ -19,7 +19,7 @@
#ifndef INCLUDED_STOC_SOURCE_SECURITY_LRU_CACHE_H
#define INCLUDED_STOC_SOURCE_SECURITY_LRU_CACHE_H
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
// __CACHE_DIAGNOSE works only for OUString keys
#ifdef __CACHE_DIAGNOSE
@@ -45,7 +45,7 @@ class lru_cache
Entry * m_pred;
Entry * m_succ;
};
- typedef ::boost::unordered_map< t_key, Entry *, t_hashKey, t_equalKey > t_key2element;
+ typedef std::unordered_map< t_key, Entry *, t_hashKey, t_equalKey > t_key2element;
t_key2element m_key2element;
::std::size_t m_size;
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 9641332ef71c..06bb75753203 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -22,8 +22,6 @@
#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
#include <uno/mapping.hxx>
#include <uno/dispatcher.h>
#include <cppuhelper/queryinterface.hxx>
@@ -55,6 +53,9 @@
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/uno/XUnloadingPreference.hpp>
+#include <unordered_map>
+#include <unordered_set>
+
using namespace com::sun::star;
using namespace css::uno;
using namespace css::beans;
@@ -142,7 +143,7 @@ struct equaltoRef_Impl
{ return rName1 == rName2; }
};
-typedef boost::unordered_set
+typedef std::unordered_set
<
Reference<XInterface >,
hashRef_Impl,
@@ -290,20 +291,20 @@ Any ImplementationEnumeration_Impl::nextElement()
/*****************************************************************************
Hash tables
*****************************************************************************/
-typedef boost::unordered_set
+typedef std::unordered_set
<
OUString,
OUStringHash
> HashSet_OWString;
-typedef boost::unordered_multimap
+typedef std::unordered_multimap
<
OUString,
Reference<XInterface >,
OUStringHash
> HashMultimap_OWString_Interface;
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
Reference<XInterface >,