diff options
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/configsettings.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/lazydelete.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/opengl/OpenGLContext.hxx | 1 | ||||
| -rw-r--r-- | include/vcl/ppdparser.hxx | 12 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 4 | ||||
| -rw-r--r-- | include/vcl/printerinfomanager.hxx | 4 |
6 files changed, 15 insertions, 20 deletions
diff --git a/include/vcl/configsettings.hxx b/include/vcl/configsettings.hxx index ae0c0e28e25c..b721f25ea380 100644 --- a/include/vcl/configsettings.hxx +++ b/include/vcl/configsettings.hxx @@ -24,14 +24,11 @@ #include <unotools/configitem.hxx> #include <vcl/dllapi.h> -#include <boost/unordered_map.hpp> - +#include <unordered_map> namespace vcl { - - - typedef boost::unordered_map< OUString, OUString, OUStringHash > OUStrMap; + typedef std::unordered_map< OUString, OUString, OUStringHash > OUStrMap; class SmallOUStrMap : public OUStrMap { public: SmallOUStrMap() : OUStrMap(1) {} }; @@ -39,8 +36,7 @@ namespace vcl class VCL_DLLPUBLIC SettingsConfigItem : public ::utl::ConfigItem { - - boost::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; + std::unordered_map< OUString, SmallOUStrMap, OUStringHash > m_aSettings; virtual void Notify( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ) SAL_OVERRIDE; diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index 5196117a9315..531d64051e8b 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -22,8 +22,8 @@ #include <vcl/dllapi.h> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> #include <algorithm> #if OSL_DEBUG_LEVEL > 2 @@ -116,7 +116,7 @@ namespace vcl }; std::vector< DeleteObjectEntry > m_aObjects; - typedef boost::unordered_map< sal_IntPtr, unsigned int > PtrToIndexMap; + typedef std::unordered_map< sal_IntPtr, unsigned int > PtrToIndexMap; PtrToIndexMap m_aPtrToIndex; /** strict weak ordering function to bring objects to be destroyed lazily diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index bab85c2fed6f..b93c12cc17fd 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -51,7 +51,6 @@ class NSOpenGLView; #include <vcl/vclopengl_dllapi.hxx> #include <boost/scoped_ptr.hpp> -#include <boost/unordered_map.hpp> #include <boost/ptr_container/ptr_map.hpp> #include <vcl/window.hxx> #include <tools/gen.hxx> diff --git a/include/vcl/ppdparser.hxx b/include/vcl/ppdparser.hxx index ddd18622e823..c9a10efcf5a9 100644 --- a/include/vcl/ppdparser.hxx +++ b/include/vcl/ppdparser.hxx @@ -20,8 +20,8 @@ #define INCLUDED_VCL_PPDPARSER_HXX #include <list> +#include <unordered_map> #include <vector> -#include <boost/unordered_map.hpp> #include <tools/stream.hxx> #include <rtl/string.hxx> @@ -62,8 +62,8 @@ class VCL_DLLPUBLIC PPDKey { friend class PPDParser; - typedef ::boost::unordered_map< OUString, PPDValue, OUStringHash > hash_type; - typedef ::std::vector< PPDValue* > value_type; + typedef std::unordered_map< OUString, PPDValue, OUStringHash > hash_type; + typedef std::vector< PPDValue* > value_type; OUString m_aKey; hash_type m_aValues; @@ -126,8 +126,8 @@ class VCL_DLLPUBLIC PPDParser friend class CUPSManager; friend class PPDCache; - typedef ::boost::unordered_map< OUString, PPDKey*, OUStringHash > hash_type; - typedef ::std::vector< PPDKey* > value_type; + typedef std::unordered_map< OUString, PPDKey*, OUStringHash > hash_type; + typedef std::vector< PPDKey* > value_type; void insertKey( const OUString& rKey, PPDKey* pKey ); public: @@ -268,7 +268,7 @@ public: class VCL_DLLPUBLIC PPDContext { - typedef ::boost::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type; + typedef std::unordered_map< const PPDKey*, const PPDValue*, PPDKeyhash > hash_type; hash_type m_aCurrentValues; const PPDParser* m_pParser; diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 99d781e60f30..3a9ad1d3c236 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -36,8 +36,8 @@ #include <com/sun/star/view/PrintableState.hpp> #include <boost/shared_ptr.hpp> -#include <boost/unordered_map.hpp> #include <set> +#include <unordered_map> class SalInfoPrinter; struct SalPrinterQueueInfo; @@ -569,7 +569,7 @@ public: class VCL_DLLPUBLIC PrinterOptionsHelper { protected: - boost::unordered_map< OUString, css::uno::Any, OUStringHash > m_aPropertyMap; + std::unordered_map< OUString, css::uno::Any, OUStringHash > m_aPropertyMap; css::uno::Sequence< css::beans::PropertyValue > m_aUIProperties; public: diff --git a/include/vcl/printerinfomanager.hxx b/include/vcl/printerinfomanager.hxx index 66d5d282f23a..d99afbe1d7c6 100644 --- a/include/vcl/printerinfomanager.hxx +++ b/include/vcl/printerinfomanager.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_VCL_PRINTERINFOMANAGER_HXX #define INCLUDED_VCL_PRINTERINFOMANAGER_HXX -#include <boost/unordered_map.hpp> #include <list> +#include <unordered_map> #include <vcl/dllapi.h> #include <vcl/helper.hxx> @@ -97,7 +97,7 @@ protected: PrinterInfo m_aInfo; }; - boost::unordered_map< OUString, Printer, OUStringHash > m_aPrinters; + std::unordered_map< OUString, Printer, OUStringHash > m_aPrinters; PrinterInfo m_aGlobalDefaults; std::list< WatchFile > m_aWatchFiles; OUString m_aDefaultPrinter; |