diff options
author | Fridrich Strba <fridrich.strba@bluewin.ch> | 2011-02-03 16:24:08 -0700 |
---|---|---|
committer | Fridrich Štrba <fridrich.strba@bluewin.ch> | 2011-02-04 00:28:23 +0100 |
commit | 030633cd53e8aacdcf1927c46dd6d5b8db58d841 (patch) | |
tree | 300d66694581d452a9709f736ad7376ca8f55043 | |
parent | aac09aee6761197a023fba69a88340fdba0684fb (diff) |
moving the rest of ure repository to boost unordered containers
-rw-r--r-- | io/source/acceptor/acc_socket.cxx | 4 | ||||
-rw-r--r-- | io/source/connector/connector.hxx | 4 | ||||
-rw-r--r-- | io/source/stm/odata.cxx | 4 | ||||
-rw-r--r-- | pyuno/source/module/pyuno_impl.hxx | 12 | ||||
-rw-r--r-- | remotebridges/source/factory/bridgefactory.cxx | 6 | ||||
-rw-r--r-- | sal/inc/rtl/string.hxx | 4 | ||||
-rw-r--r-- | sal/inc/rtl/ustring.hxx | 4 | ||||
-rw-r--r-- | stoc/source/corereflection/base.hxx | 6 | ||||
-rw-r--r-- | stoc/source/corereflection/lrucache.hxx | 4 | ||||
-rw-r--r-- | stoc/source/inspect/introspection.cxx | 12 | ||||
-rw-r--r-- | stoc/source/invocation_adapterfactory/iafactory.cxx | 8 | ||||
-rw-r--r-- | stoc/source/namingservice/namingservice.cxx | 4 | ||||
-rw-r--r-- | stoc/source/security/file_policy.cxx | 4 | ||||
-rw-r--r-- | stoc/source/security/lru_cache.h | 4 | ||||
-rw-r--r-- | stoc/source/servicemanager/servicemanager.cxx | 12 | ||||
-rw-r--r-- | stoc/source/tdmanager/lrucache.hxx | 4 | ||||
-rw-r--r-- | ure/source/uretest/cppmain.cc | 2 |
17 files changed, 49 insertions, 49 deletions
diff --git a/io/source/acceptor/acc_socket.cxx b/io/source/acceptor/acc_socket.cxx index de362b1f51d2..c3ae4a775e4c 100644 --- a/io/source/acceptor/acc_socket.cxx +++ b/io/source/acceptor/acc_socket.cxx @@ -30,7 +30,7 @@ #include "precompiled_io.hxx" #include "acceptor.hxx" -#include <hash_set> +#include <boost/unordered_set.hpp> #include <algorithm> #include <rtl/ustrbuf.hxx> @@ -68,7 +68,7 @@ namespace io_acceptor { }; - typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, + typedef ::boost::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > XStreamListener_hash_set; diff --git a/io/source/connector/connector.hxx b/io/source/connector/connector.hxx index ed4015ded0a5..6ed0e91619c8 100644 --- a/io/source/connector/connector.hxx +++ b/io/source/connector/connector.hxx @@ -33,7 +33,7 @@ #include <com/sun/star/connection/XConnection.hpp> #include <com/sun/star/connection/XConnectionBroadcaster.hpp> -#include <hash_set> +#include <boost/unordered_set.hpp> # include <osl/socket.hxx> # include <osl/pipe.hxx> @@ -60,7 +60,7 @@ namespace stoc_connector } }; - typedef ::std::hash_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, + typedef ::boost::unordered_set< ::com::sun::star::uno::Reference< ::com::sun::star::io::XStreamListener>, ReferenceHash< ::com::sun::star::io::XStreamListener>, ReferenceEqual< ::com::sun::star::io::XStreamListener> > XStreamListener_hash_set; diff --git a/io/source/stm/odata.cxx b/io/source/stm/odata.cxx index b5be8e855ba9..4237977b6b15 100644 --- a/io/source/stm/odata.cxx +++ b/io/source/stm/odata.cxx @@ -31,7 +31,7 @@ // streams -#include <hash_map> +#include <boost/unordered_map.hpp> #include <vector> #include <com/sun/star/io/XObjectInputStream.hpp> @@ -951,7 +951,7 @@ struct hashObjectContainer_Impl } }; -typedef hash_map +typedef boost::unordered_map < Reference< XInterface >, sal_Int32, diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx index 537120e2457a..c1a38b5e06aa 100644 --- a/pyuno/source/module/pyuno_impl.hxx +++ b/pyuno/source/module/pyuno_impl.hxx @@ -30,8 +30,8 @@ #include <pyuno/pyuno.hxx> -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <com/sun/star/beans/XIntrospection.hpp> #include <com/sun/star/script/XTypeConverter.hpp> @@ -81,7 +81,7 @@ static const sal_Int32 VAL2STR_MODE_SHALLOW = 1; rtl::OUString val2str( const void * pVal, typelib_TypeDescriptionReference * pTypeRef, sal_Int32 mode = VAL2STR_MODE_DEEP ) SAL_THROW( () ); //-------------------------------------------------- -typedef ::std::hash_map +typedef ::boost::unordered_map < PyRef, com::sun::star::uno::WeakReference< com::sun::star::script::XInvocation >, @@ -90,7 +90,7 @@ typedef ::std::hash_map > PyRef2Adapter; -typedef ::std::hash_map +typedef ::boost::unordered_map < rtl::OUString, PyRef, @@ -98,7 +98,7 @@ rtl::OUStringHash, std::equal_to<rtl::OUString> > ExceptionClassMap; -typedef ::std::hash_map +typedef ::boost::unordered_map < rtl::OUString, com::sun::star::uno::Sequence< sal_Int16 >, @@ -106,7 +106,7 @@ typedef ::std::hash_map std::equal_to< rtl::OUString > > MethodOutIndexMap; -typedef ::std::hash_set< PyRef , PyRef::Hash , std::equal_to<PyRef> > ClassSet; +typedef ::boost::unordered_set< PyRef , PyRef::Hash , std::equal_to<PyRef> > ClassSet; PyObject* PyUNO_new( const com::sun::star::uno::Any & targetInterface, diff --git a/remotebridges/source/factory/bridgefactory.cxx b/remotebridges/source/factory/bridgefactory.cxx index 0e3726f3eae5..b6ef55d18a1c 100644 --- a/remotebridges/source/factory/bridgefactory.cxx +++ b/remotebridges/source/factory/bridgefactory.cxx @@ -25,7 +25,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <hash_map> +#include <boost/unordered_map.hpp> #include <rtl/alloc.h> @@ -84,7 +84,7 @@ namespace remotebridges_factory } }; - typedef ::std::hash_map + typedef ::boost::unordered_map < OUString, WeakReference< XBridge >, @@ -93,7 +93,7 @@ namespace remotebridges_factory > BridgeHashMap; - typedef ::std::hash_map + typedef ::boost::unordered_map < OUString, OUString, diff --git a/sal/inc/rtl/string.hxx b/sal/inc/rtl/string.hxx index da2144d83323..29583e9fde5b 100644 --- a/sal/inc/rtl/string.hxx +++ b/sal/inc/rtl/string.hxx @@ -422,7 +422,7 @@ public: @return a hash code value for this object. - @see rtl::OStringHash for convenient use of STLPort's hash_map + @see rtl::OStringHash for convenient use of boost::unordered_map */ sal_Int32 hashCode() const SAL_THROW(()) { @@ -914,7 +914,7 @@ public: /** A helper to use OStrings with hash maps. Instances of this class are unary function objects that can be used as - hash function arguments to STLPort's hash_map and similar constructs. + hash function arguments to boost::unordered_map and similar constructs. */ struct OStringHash { diff --git a/sal/inc/rtl/ustring.hxx b/sal/inc/rtl/ustring.hxx index 6860b7c55c9a..b56413d8bfbe 100644 --- a/sal/inc/rtl/ustring.hxx +++ b/sal/inc/rtl/ustring.hxx @@ -748,7 +748,7 @@ public: @return a hash code value for this object. - @see rtl::OUStringHash for convenient use of STLPort's hash_map + @see rtl::OUStringHash for convenient use of boost::unordered_map */ sal_Int32 hashCode() const SAL_THROW(()) { @@ -1479,7 +1479,7 @@ public: /** A helper to use OUStrings with hash maps. Instances of this class are unary function objects that can be used as - hash function arguments to STLPort's hash_map and similar constructs. + hash function arguments to boost::unordered_map and similar constructs. */ struct OUStringHash { diff --git a/stoc/source/corereflection/base.hxx b/stoc/source/corereflection/base.hxx index 64e7b5bfc13c..0bdab4cee972 100644 --- a/stoc/source/corereflection/base.hxx +++ b/stoc/source/corereflection/base.hxx @@ -44,7 +44,7 @@ #include <list> #include <algorithm> #endif -#include <hash_map> +#include <boost/unordered_map.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -97,9 +97,9 @@ inline typelib_TypeDescription * getTypeByName( const OUString & rName ) return pTypeDescr; } -typedef std::hash_map< OUString, WeakReference< XIdlField >, +typedef boost::unordered_map< OUString, WeakReference< XIdlField >, FctHashOUString, equal_to< OUString > > OUString2Field; -typedef std::hash_map< OUString, WeakReference< XIdlMethod >, +typedef boost::unordered_map< OUString, WeakReference< XIdlMethod >, FctHashOUString, equal_to< OUString > > OUString2Method; //================================================================================================== diff --git a/stoc/source/corereflection/lrucache.hxx b/stoc/source/corereflection/lrucache.hxx index 8aab901c349a..4e44d537cdcf 100644 --- a/stoc/source/corereflection/lrucache.hxx +++ b/stoc/source/corereflection/lrucache.hxx @@ -34,7 +34,7 @@ #include <osl/mutex.hxx> #include "rtl/ustring.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> /** Implementation of a least recently used (lru) cache. <br> @@ -50,7 +50,7 @@ class LRU_Cache CacheEntry * pPred; CacheEntry * pSucc; }; - typedef ::std::hash_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element; + typedef ::boost::unordered_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element; mutable ::osl::Mutex _aCacheMutex; sal_Int32 _nCachedElements; diff --git a/stoc/source/inspect/introspection.cxx b/stoc/source/inspect/introspection.cxx index ee5d02260608..5716630a3b50 100644 --- a/stoc/source/inspect/introspection.cxx +++ b/stoc/source/inspect/introspection.cxx @@ -76,7 +76,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/strbuf.hxx> -#include <hash_map> +#include <boost/unordered_map.hpp> using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -174,7 +174,7 @@ struct eqName_Impl } }; -typedef std::hash_map +typedef boost::unordered_map < OUString, sal_Int32, @@ -186,7 +186,7 @@ IntrospectionNameMap; // Hashtable zur Zuordnung der exakten Namen zu den zu Lower-Case // konvertierten Namen, dient zur Unterst�tzung von XExactName -typedef std::hash_map +typedef boost::unordered_map < OUString, OUString, @@ -1567,7 +1567,7 @@ struct hashIntrospectionAccessCache_Impl }; -typedef std::hash_map +typedef boost::unordered_map < hashIntrospectionKey_Impl, IntrospectionAccessStatic_Impl*, @@ -1666,7 +1666,7 @@ size_t TypeProviderAccessCache_Impl::operator()(const hashTypeProviderKey_Impl & } -typedef std::hash_map +typedef boost::unordered_map < hashTypeProviderKey_Impl, IntrospectionAccessStatic_Impl*, @@ -1993,7 +1993,7 @@ struct eqInterface_Impl } }; -typedef std::hash_map +typedef boost::unordered_map < void*, void*, diff --git a/stoc/source/invocation_adapterfactory/iafactory.cxx b/stoc/source/invocation_adapterfactory/iafactory.cxx index 3227ce4342f1..c1e6a55cb44a 100644 --- a/stoc/source/invocation_adapterfactory/iafactory.cxx +++ b/stoc/source/invocation_adapterfactory/iafactory.cxx @@ -29,8 +29,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <osl/diagnose.h> #include <osl/interlck.h> @@ -111,8 +111,8 @@ struct hash_ptr inline size_t operator() ( void * p ) const { return (size_t)p; } }; -typedef hash_set< void *, hash_ptr, equal_to< void * > > t_ptr_set; -typedef hash_map< void *, t_ptr_set, hash_ptr, equal_to< void * > > t_ptr_map; +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; //============================================================================== class FactoryImpl diff --git a/stoc/source/namingservice/namingservice.cxx b/stoc/source/namingservice/namingservice.cxx index 215e7c9180ae..761f9161966f 100644 --- a/stoc/source/namingservice/namingservice.cxx +++ b/stoc/source/namingservice/namingservice.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/mutex.hxx> #include <osl/diagnose.h> #include <uno/dispatcher.h> @@ -103,7 +103,7 @@ struct hashOWString_Impl { return rName.hashCode(); } }; -typedef hash_map +typedef boost::unordered_map < OUString, Reference<XInterface >, diff --git a/stoc/source/security/file_policy.cxx b/stoc/source/security/file_policy.cxx index ce1a525e659f..aad4b7cfc37b 100644 --- a/stoc/source/security/file_policy.cxx +++ b/stoc/source/security/file_policy.cxx @@ -29,7 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_stoc.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> #include <osl/diagnose.h> #include <osl/file.h> @@ -93,7 +93,7 @@ class FilePolicy AccessControl m_ac; Sequence< Any > m_defaultPermissions; - typedef std::hash_map< OUString, Sequence< Any >, OUStringHash > t_permissions; + typedef boost::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 a03a1a3e50f3..4b7440e9dce8 100644 --- a/stoc/source/security/lru_cache.h +++ b/stoc/source/security/lru_cache.h @@ -28,7 +28,7 @@ #ifndef _STOC_SEC_LRU_CACHE_H_ #define _STOC_SEC_LRU_CACHE_H_ -#include <hash_map> +#include <boost/unordered_map.hpp> // __CACHE_DIAGNOSE works only for OUString keys #ifdef __CACHE_DIAGNOSE @@ -54,7 +54,7 @@ class lru_cache Entry * m_pred; Entry * m_succ; }; - typedef ::std::hash_map< t_key, Entry *, t_hashKey, t_equalKey > t_key2element; + typedef ::boost::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 da3949a1c3ff..a98a3dbf9306 100644 --- a/stoc/source/servicemanager/servicemanager.cxx +++ b/stoc/source/servicemanager/servicemanager.cxx @@ -32,8 +32,8 @@ #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> -#include <hash_map> -#include <hash_set> +#include <boost/unordered_map.hpp> +#include <boost/unordered_set.hpp> #include <list> #include <uno/mapping.hxx> #include <uno/dispatcher.h> @@ -283,7 +283,7 @@ struct equaltoRef_Impl { return rName1 == rName2; } }; -typedef hash_set +typedef boost::unordered_set < Reference<XInterface >, hashRef_Impl, @@ -450,14 +450,14 @@ struct hashOWString_Impl { return rName.hashCode(); } }; -typedef hash_set +typedef boost::unordered_set < OUString, hashOWString_Impl, equalOWString_Impl > HashSet_OWString; -typedef hash_multimap +typedef boost::unordered_multimap < OUString, Reference<XInterface >, @@ -465,7 +465,7 @@ typedef hash_multimap equalOWString_Impl > HashMultimap_OWString_Interface; -typedef hash_map +typedef boost::unordered_map < OUString, Reference<XInterface >, diff --git a/stoc/source/tdmanager/lrucache.hxx b/stoc/source/tdmanager/lrucache.hxx index 6f74a9b9a1d7..4f14fc7a2a91 100644 --- a/stoc/source/tdmanager/lrucache.hxx +++ b/stoc/source/tdmanager/lrucache.hxx @@ -34,7 +34,7 @@ #include <osl/mutex.hxx> #include "rtl/ustring.hxx" -#include <hash_map> +#include <boost/unordered_map.hpp> /** Implementation of a least recently used (lru) cache. @@ -51,7 +51,7 @@ class LRU_Cache CacheEntry * pPred; CacheEntry * pSucc; }; - typedef ::std::hash_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element; + typedef ::boost::unordered_map< t_Key, CacheEntry *, t_KeyHash, t_KeyEqual > t_Key2Element; mutable ::osl::Mutex _aCacheMutex; sal_Int32 _nCachedElements; diff --git a/ure/source/uretest/cppmain.cc b/ure/source/uretest/cppmain.cc index 57b06451f01f..8a533be1cf42 100644 --- a/ure/source/uretest/cppmain.cc +++ b/ure/source/uretest/cppmain.cc @@ -32,7 +32,7 @@ #include <functional> #include <memory> #include <new> -#include <hash_map> +#include <boost/unordered_map.hpp> #include "com/sun/star/lang/XMain.hpp" #include "com/sun/star/lang/XMultiComponentFactory.hpp" |