[Libreoffice-commits] core.git: 2 commits - cppu/source cpputools/source

[Julien Nabet (via logerrit)]

 cppu/source/typelib/typelib.cxx    |    7 +++----
 cppu/source/uno/lbmap.cxx          |    5 ++---
 cpputools/source/unoexe/unoexe.cxx |    1 -
 3 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit f7a456af92f3c1c47731b7ad0494e74897aea4d3
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Oct 3 14:10:36 2021 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Oct 3 19:27:37 2021 +0200

    drop 'using namespace std' in cpputools
    
    Change-Id: Ib454519ba3fb316557dc902c3ed03f9dec9d7900
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123021
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

diff --git a/cpputools/source/unoexe/unoexe.cxx 
b/cpputools/source/unoexe/unoexe.cxx
index 46d43e344757..38f1249ba71e 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -49,7 +49,6 @@
 #include <com/sun/star/bridge/XBridgeFactory.hpp>
 #include <com/sun/star/bridge/XBridge.hpp>
 
-using namespace std;
 using namespace osl;
 using namespace cppu;
 using namespace com::sun::star::uno;
commit db12f7a63cb663493f364535e12b670bd13fbea0
Author:     Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sun Oct 3 14:09:18 2021 +0200
Commit:     Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sun Oct 3 19:27:23 2021 +0200

    drop 'using namespace std' in cppu
    
    Change-Id: I1c9e6d27e47e25bc5c96ceac8d72c7c112c73d61
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123019
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2...@yahoo.fr>

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;
 };
 
 }