diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 17:42:08 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-12-05 18:36:21 +0100 |
| commit | 0c55303581156d01992d9d958ac5f7aafc4a3ebb (patch) | |
| tree | dd0243205b6a81139ee34e93b31b8c60ec384514 /include | |
| parent | 75c4bff5f402229267d53ca6f5ece28473bff7d8 (diff) | |
Get rid of DECLARE_STL_STDKEY_SET
Change-Id: I4817694d183d525fa5a29eb9693a20d491549e5d
Diffstat (limited to 'include')
| -rw-r--r-- | include/comphelper/stl_types.hxx | 5 | ||||
| -rw-r--r-- | include/connectivity/dbcharset.hxx | 3 | ||||
| -rw-r--r-- | include/xmloff/xmlimp.hxx | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/comphelper/stl_types.hxx b/include/comphelper/stl_types.hxx index 6da8d9942367..9d129c2ab21c 100644 --- a/include/comphelper/stl_types.hxx +++ b/include/comphelper/stl_types.hxx @@ -25,7 +25,6 @@ #include <map> #include <stack> -#include <set> #include <math.h> #include <functional> @@ -260,10 +259,6 @@ OutputIter intersperse( #define DECLARE_STL_USTRINGACCESS_MAP(valuetype, classname) \ DECLARE_STL_MAP(OUString, valuetype, ::comphelper::UStringLess, classname) \ -#define DECLARE_STL_STDKEY_SET(valuetype, classname) \ - typedef ::std::set< valuetype > classname; \ - DECLARE_STL_ITERATORS(classname) \ - #endif // INCLUDED_COMPHELPER_STL_TYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index 7286bfc513e9..a07d024904fa 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -23,6 +23,7 @@ #include <sal/config.h> #include <cstddef> +#include <set> #include <comphelper/stl_types.hxx> #include <rtl/textenc.h> @@ -55,7 +56,7 @@ namespace dbtools class OOO_DLLPUBLIC_DBTOOLS OCharsetMap { protected: - DECLARE_STL_STDKEY_SET( rtl_TextEncoding, TextEncBag ); + typedef std::set<rtl_TextEncoding> TextEncBag; TextEncBag m_aEncodings; diff --git a/include/xmloff/xmlimp.hxx b/include/xmloff/xmlimp.hxx index b30529800971..b2e3bafe305d 100644 --- a/include/xmloff/xmlimp.hxx +++ b/include/xmloff/xmlimp.hxx @@ -21,6 +21,9 @@ #define INCLUDED_XMLOFF_XMLIMP_HXX #include <sal/config.h> + +#include <set> + #include <xmloff/dllapi.h> #include <sal/types.h> #include <com/sun/star/embed/XStorage.hpp> |