summaryrefslogtreecommitdiff
path: root/extensions
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 /extensions
parent18861c30a63dd419f3be47896a760109ac06c47a (diff)
boost::unordered_map->std::unordered_map
Change-Id: I5d458f43616edc395faa8c27edaddc7d515166db
Diffstat (limited to 'extensions')
-rw-r--r--extensions/source/bibliography/framectr.cxx4
-rw-r--r--extensions/source/ole/oleobjw.cxx8
-rw-r--r--extensions/source/ole/oleobjw.hxx6
-rw-r--r--extensions/source/ole/unoconversionutilities.hxx26
-rw-r--r--extensions/source/ole/unoobjw.cxx6
-rw-r--r--extensions/source/ole/unoobjw.hxx6
-rw-r--r--extensions/source/propctrlr/browserlistbox.hxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.cxx2
-rw-r--r--extensions/source/propctrlr/eventhandler.hxx2
-rw-r--r--extensions/source/propctrlr/pcrcommontypes.hxx4
-rw-r--r--extensions/source/propctrlr/propcontroller.hxx10
11 files changed, 38 insertions, 38 deletions
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index ba2f7a8747da..43029992e7eb 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -51,7 +51,7 @@
#include <vcl/edit.hxx>
#include <osl/mutex.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
using namespace osl;
using namespace cppu;
@@ -98,7 +98,7 @@ static const DispatchInfo SupportedCommandsArray[] =
{ 0 , 0 , false }
};
-typedef ::boost::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache;
+typedef std::unordered_map< OUString, CacheDispatchInfo, OUStringHash, ::std::equal_to< OUString > > CmdToInfoCache;
const CmdToInfoCache& GetCommandToInfoCache()
{
diff --git a/extensions/source/ole/oleobjw.cxx b/extensions/source/ole/oleobjw.cxx
index cb7ee0bd63a7..b5560fcfc16a 100644
--- a/extensions/source/ole/oleobjw.cxx
+++ b/extensions/source/ole/oleobjw.cxx
@@ -79,16 +79,16 @@ namespace ole_adapter
// called.
// Before UNO object is wrapped to COM object this map is checked
// to see if the UNO object is already a wrapper.
-boost::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
+std::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
// key: XInterface of the wrapper object.
// value: XInterface of the Interface created by the Invocation Adapter Factory.
// A COM wrapper is responsible for removing the corresponding entry
// in AdapterToWrappperMap if it is being destroyed. Because the wrapper does not
// know about its adapted interface it uses WrapperToAdapterMap to get the
// adapted interface which is then used to locate the entry in AdapterToWrapperMap.
-boost::unordered_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap;
+std::unordered_map<sal_uInt32,sal_uInt32> WrapperToAdapterMap;
-boost::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
+std::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
/*****************************************************************************
class implementation IUnknownWrapper_Impl
@@ -115,7 +115,7 @@ IUnknownWrapper_Impl::~IUnknownWrapper_Impl()
#endif
// remove entries in global maps
- typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator _IT;
+ typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator _IT;
_IT it= WrapperToAdapterMap.find( (sal_uInt32) xIntRoot);
if( it != WrapperToAdapterMap.end())
{
diff --git a/extensions/source/ole/oleobjw.hxx b/extensions/source/ole/oleobjw.hxx
index b9e55f974b78..886c9aa2284b 100644
--- a/extensions/source/ole/oleobjw.hxx
+++ b/extensions/source/ole/oleobjw.hxx
@@ -23,8 +23,8 @@
#include "ole2uno.hxx"
#include "wincrap.hxx"
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <cppuhelper/implbase3.hxx>
#include <cppuhelper/implbase4.hxx>
@@ -53,9 +53,9 @@ namespace ole_adapter
-typedef boost::unordered_map<OUString, pair<DISPID, unsigned short>, OUStringHash> DispIdMap;
+typedef std::unordered_map<OUString, pair<DISPID, unsigned short>, OUStringHash> DispIdMap;
-typedef boost::unordered_multimap<OUString, unsigned int, OUStringHash> TLBFuncIndexMap;
+typedef std::unordered_multimap<OUString, unsigned int, OUStringHash> TLBFuncIndexMap;
// This class wraps an IDispatch and maps XInvocation calls to IDispatch calls on the wrapped object.
// If m_TypeDescription is set then this class represents an UNO interface implemented in a COM component.
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index d0ab45276bec..84feeedb43bd 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -32,7 +32,7 @@
#include "ole2uno.hxx"
#include "unotypewrapper.hxx"
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
// for some reason DECIMAL_NEG (wtypes.h) which contains BYTE is not resolved.
typedef unsigned char BYTE;
@@ -63,17 +63,17 @@ using namespace com::sun::star::bridge::oleautomation;
using namespace boost;
namespace ole_adapter
{
-extern boost::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
-extern boost::unordered_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap;
-typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap;
-typedef boost::unordered_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap;
+extern std::unordered_map<sal_uInt32, sal_uInt32> AdapterToWrapperMap;
+extern std::unordered_map<sal_uInt32, sal_uInt32> WrapperToAdapterMap;
+typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator IT_Wrap;
+typedef std::unordered_map<sal_uInt32, sal_uInt32>::iterator CIT_Wrap;
//Maps IUnknown pointers to a weak reference of the respective wrapper class (e.g.
// IUnknownWrapperImpl. It is the responsibility of the wrapper to remove the entry when
// it is being destroyed.
// Used to ensure that an Automation object is always mapped to the same UNO objects.
-extern boost::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
-typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com;
-typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com;
+extern std::unordered_map<sal_uInt32, WeakReference<XInterface> > ComPtrToWrapperMap;
+typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Com;
+typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Com;
// Maps XInterface pointers to a weak reference of its wrapper class (i.e.
// InterfaceOleWrapper_Impl). It is the responsibility of the wrapper to remove the entry when
@@ -81,9 +81,9 @@ typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iter
// is mapped to IDispatch which is kept alive in the COM environment. If the same
// UNO interface is mapped again to COM then the IDispach of the first mapped instance
// must be returned.
-extern boost::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
-typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno;
-typedef boost::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno;
+extern std::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
+typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::iterator IT_Uno;
+typedef std::unordered_map<sal_uInt32, WeakReference<XInterface> >::const_iterator CIT_Uno;
#ifdef __MINGW32__
inline void reduceRange( Any& any);
#endif
@@ -1391,7 +1391,7 @@ void UnoConversionUtilities<T>::createUnoObjectWrapper(const Any & rObj, VARIANT
else
{
Reference<XInterface> xIntComWrapper = xInt;
- typedef boost::unordered_map<sal_uInt32,sal_uInt32>::iterator _IT;
+ typedef std::unordered_map<sal_uInt32,sal_uInt32>::iterator _IT;
// Adapter? then get the COM wrapper to which the adapter delegates its calls
_IT it= AdapterToWrapperMap.find( (sal_uInt32) xInt.get());
if( it != AdapterToWrapperMap.end() )
@@ -1881,7 +1881,7 @@ Reference<XInterface> UnoConversionUtilities<T>::createAdapter(const Sequence<Ty
// in a global map. Thus we can determine in a call to createUnoObjectWrapper whether the UNO
// object is a wrapped COM object. In that case we extract the original COM object rather than
// creating a wrapper around the UNO object.
- typedef boost::unordered_map<sal_uInt32,sal_uInt32>::value_type VALUE;
+ typedef std::unordered_map<sal_uInt32,sal_uInt32>::value_type VALUE;
AdapterToWrapperMap.insert( VALUE( (sal_uInt32) xIntAdapted.get(), (sal_uInt32) receiver.get()));
WrapperToAdapterMap.insert( VALUE( (sal_uInt32) receiver.get(), (sal_uInt32) xIntAdapted.get()));
}
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index d8c20de59568..1ad58f9a0e02 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -20,9 +20,9 @@
#include "ole2uno.hxx"
#include <stdio.h>
-#include <vector>
#include <list>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
+#include <vector>
#include <osl/diagnose.h>
#include <salhelper/simplereferenceobject.hxx>
@@ -68,7 +68,7 @@ extern "C" const GUID IID_IDispatchEx;
namespace ole_adapter
{
-boost::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
+std::unordered_map<sal_uInt32, WeakReference<XInterface> > UnoObjToWrapperMap;
static sal_Bool writeBackOutParameter(VARIANTARG* pDest, VARIANT* pSource);
static sal_Bool writeBackOutParameter2( VARIANTARG* pDest, VARIANT* pSource);
static HRESULT mapCannotConvertException(const CannotConvertException &e, unsigned int * puArgErr);
diff --git a/extensions/source/ole/unoobjw.hxx b/extensions/source/ole/unoobjw.hxx
index 87e27153bd21..f31ef1bc5ff3 100644
--- a/extensions/source/ole/unoobjw.hxx
+++ b/extensions/source/ole/unoobjw.hxx
@@ -76,21 +76,21 @@ struct MemberInfo
OUString name;
};
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
DISPID,
OUStringHash
> NameToIdMap;
-typedef boost::unordered_map
+typedef std::unordered_map
<
OUString,
sal_Bool,
OUStringHash
> BadNameMap;
-typedef boost::unordered_map
+typedef std::unordered_map
<
DISPID,
MemberInfo
diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx
index 272d4e4d8157..839c8b5538aa 100644
--- a/extensions/source/propctrlr/browserlistbox.hxx
+++ b/extensions/source/propctrlr/browserlistbox.hxx
@@ -33,8 +33,8 @@
#include <rtl/ref.hxx>
#include <set>
+#include <unordered_map>
#include <vector>
-#include <boost/unordered_map.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/extensions/source/propctrlr/eventhandler.cxx b/extensions/source/propctrlr/eventhandler.cxx
index 7a6cd34729ce..4ea25f7abdec 100644
--- a/extensions/source/propctrlr/eventhandler.cxx
+++ b/extensions/source/propctrlr/eventhandler.cxx
@@ -325,7 +325,7 @@ namespace pcr
class EventHolder : public EventHolder_Base
{
private:
- typedef ::boost::unordered_map< OUString, ScriptEventDescriptor, OUStringHash > EventMap;
+ typedef std::unordered_map< OUString, ScriptEventDescriptor, OUStringHash > EventMap;
typedef ::std::map< EventId, EventMap::iterator > EventMapIndexAccess;
EventMap m_aEventNameAccess;
diff --git a/extensions/source/propctrlr/eventhandler.hxx b/extensions/source/propctrlr/eventhandler.hxx
index babfc5c8a5e4..e2bd3d52ca2d 100644
--- a/extensions/source/propctrlr/eventhandler.hxx
+++ b/extensions/source/propctrlr/eventhandler.hxx
@@ -66,7 +66,7 @@ namespace pcr
const OString& _sUniqueBrowseId );
};
- typedef ::boost::unordered_map< OUString, EventDescription, OUStringHash > EventMap;
+ typedef std::unordered_map< OUString, EventDescription, OUStringHash > EventMap;
//= EventHandler
diff --git a/extensions/source/propctrlr/pcrcommontypes.hxx b/extensions/source/propctrlr/pcrcommontypes.hxx
index 37ab9b009eb4..f16ee1ba1658 100644
--- a/extensions/source/propctrlr/pcrcommontypes.hxx
+++ b/extensions/source/propctrlr/pcrcommontypes.hxx
@@ -23,14 +23,14 @@
#include <com/sun/star/beans/Property.hpp>
#include <rtl/ustring.hxx>
-#include <boost/unordered_map.hpp>
+#include <unordered_map>
namespace pcr
{
- typedef ::boost::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash >
+ typedef std::unordered_map< OUString, ::com::sun::star::beans::Property, OUStringHash >
PropertyMap;
diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx
index 5dbe78a2bbff..af943de01f13 100644
--- a/extensions/source/propctrlr/propcontroller.hxx
+++ b/extensions/source/propctrlr/propcontroller.hxx
@@ -56,9 +56,9 @@
#include <comphelper/broadcasthelper.hxx>
#include <map>
-#include <boost/unordered_map.hpp>
-#include <vector>
#include <memory>
+#include <unordered_map>
+#include <vector>
namespace vcl { class Window; }
@@ -113,9 +113,9 @@ namespace pcr
typedef ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >
PropertyHandlerRef;
typedef ::std::vector< PropertyHandlerRef > PropertyHandlerArray;
- typedef ::boost::unordered_map< OUString, PropertyHandlerRef, OUStringHash >
+ typedef std::unordered_map< OUString, PropertyHandlerRef, OUStringHash >
PropertyHandlerRepository;
- typedef ::boost::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash >
+ typedef std::unordered_multimap< OUString, PropertyHandlerRef, OUStringHash >
PropertyHandlerMultiRepository;
PropertyHandlerRepository m_aPropertyHandlers;
PropertyHandlerMultiRepository m_aDependencyHandlers;
@@ -133,7 +133,7 @@ namespace pcr
/// the property we're just committing
OUString m_sCommittingProperty;
- typedef ::boost::unordered_map< OUString, sal_uInt16, OUStringHash > HashString2Int16;
+ typedef std::unordered_map< OUString, sal_uInt16, OUStringHash > HashString2Int16;
HashString2Int16 m_aPageIds;
bool m_bContainerFocusListening;