summaryrefslogtreecommitdiff
path: root/ucb/source/ucp/file
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 /ucb/source/ucp/file
parent18861c30a63dd419f3be47896a760109ac06c47a (diff)
boost::unordered_map->std::unordered_map
Change-Id: I5d458f43616edc395faa8c27edaddc7d515166db
Diffstat (limited to 'ucb/source/ucp/file')
-rw-r--r--ucb/source/ucp/file/filnot.hxx5
-rw-r--r--ucb/source/ucp/file/filtask.hxx7
-rw-r--r--ucb/source/ucp/file/shell.hxx12
3 files changed, 11 insertions, 13 deletions
diff --git a/ucb/source/ucp/file/filnot.hxx b/ucb/source/ucp/file/filnot.hxx
index 0edf0b5719f3..5e782d1b61e2 100644
--- a/ucb/source/ucp/file/filnot.hxx
+++ b/ucb/source/ucp/file/filnot.hxx
@@ -19,13 +19,12 @@
#ifndef INCLUDED_UCB_SOURCE_UCP_FILE_FILNOT_HXX
#define INCLUDED_UCB_SOURCE_UCP_FILE_FILNOT_HXX
-#include <boost/unordered_map.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/beans/PropertyChangeEvent.hpp>
#include <com/sun/star/ucb/XContentIdentifier.hpp>
#include "filglob.hxx"
-
+#include <unordered_map>
namespace fileaccess {
@@ -81,7 +80,7 @@ namespace fileaccess {
};
- typedef boost::unordered_map< OUString,
+ typedef std::unordered_map< OUString,
com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::uno::XInterface > >,
OUStringHash > ListenerMap;
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index a08c1c84ef08..04ede9303266 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_UCB_SOURCE_UCP_FILE_FILTASK_HXX
#endif
-#include <boost/unordered_map.hpp>
#include <rtl/ustring.hxx>
#include "osl/mutex.hxx"
@@ -29,7 +28,9 @@
#include <com/sun/star/ucb/XProgressHandler.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
+#include <boost/functional/hash.hpp>
#include "filerror.hxx"
+#include <unordered_map>
namespace fileaccess
{
@@ -138,9 +139,7 @@ namespace fileaccess
}; // end class TaskHandling
- typedef boost::unordered_map< sal_Int32,TaskHandling,boost::hash< sal_Int32 > > TaskMap;
-
-
+ typedef std::unordered_map< sal_Int32,TaskHandling,boost::hash< sal_Int32 > > TaskMap;
private:
osl::Mutex m_aMutex;
diff --git a/ucb/source/ucp/file/shell.hxx b/ucb/source/ucp/file/shell.hxx
index 7582bc81df4c..a8bae857822d 100644
--- a/ucb/source/ucp/file/shell.hxx
+++ b/ucb/source/ucp/file/shell.hxx
@@ -25,10 +25,6 @@
#include <cppuhelper/weak.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <cppuhelper/typeprovider.hxx>
-#include <vector>
-#include <boost/unordered_map.hpp>
-#include <boost/unordered_set.hpp>
-#include <list>
#include <osl/file.hxx>
#include "osl/mutex.hxx"
@@ -58,6 +54,10 @@
#include <com/sun/star/ucb/ContentInfo.hpp>
#include "filtask.hxx"
#include "filnot.hxx"
+#include <list>
+#include <unordered_map>
+#include <unordered_set>
+#include <vector>
namespace fileaccess {
@@ -130,7 +130,7 @@ namespace fileaccess {
}
};
- typedef boost::unordered_set< MyProperty,hMyProperty,eMyProperty > PropertySet;
+ typedef std::unordered_set< MyProperty,hMyProperty,eMyProperty > PropertySet;
typedef std::list< Notifier* > NotifierList;
@@ -151,7 +151,7 @@ namespace fileaccess {
com::sun::star::uno::Reference< com::sun::star::beans::XPropertyAccess > xA;
};
- typedef boost::unordered_map< OUString,UnqPathData,OUStringHash > ContentMap;
+ typedef std::unordered_map< OUString,UnqPathData,OUStringHash > ContentMap;
public: