diff options
| -rw-r--r-- | cppu/source/typelib/typelib.cxx | 7 | ||||
| -rw-r--r-- | cppu/source/uno/lbmap.cxx | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index fa2a73d767ac..eadc2c3bdde9 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -39,7 +39,6 @@ #include <uno/any2.h> #include "typelib.hxx" -using namespace std; using namespace osl; #ifdef _WIN32 @@ -158,9 +157,9 @@ struct hashStr_Impl typedef std::unordered_map< const sal_Unicode *, typelib_TypeDescriptionReference *, hashStr_Impl, equalStr_Impl > WeakMap_Impl; -typedef pair< void *, typelib_typedescription_Callback > CallbackEntry; -typedef list< CallbackEntry > CallbackSet_Impl; -typedef list< typelib_TypeDescription * > TypeDescriptionList_Impl; +typedef std::pair< void *, typelib_typedescription_Callback > CallbackEntry; +typedef std::list< CallbackEntry > CallbackSet_Impl; +typedef std::list< typelib_TypeDescription * > TypeDescriptionList_Impl; // # of cached elements static sal_Int32 nCacheSize = 256; diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx index a88259627b2c..585082ac1d06 100644 --- a/cppu/source/uno/lbmap.cxx +++ b/cppu/source/uno/lbmap.cxx @@ -47,7 +47,6 @@ #include "cascade_mapping.hxx" #include "loadmodule.hxx" -using namespace std; using namespace osl; using namespace com::sun::star::uno; @@ -156,11 +155,11 @@ struct MappingsData t_Mapping2Entry aMapping2Entry; Mutex aCallbacksMutex; - set< uno_getMappingFunc > + std::set< uno_getMappingFunc > aCallbacks; std::mutex aNegativeLibsMutex; - set<OUString> aNegativeLibs; + std::set<OUString> aNegativeLibs; }; } |