[Libreoffice-commits] core.git: cli_ure/source

Julien Nabet (via logerrit) logerrit at kemper.freedesktop.org
Thu Oct 7 11:38:39 UTC 2021


 cli_ure/source/uno_bridge/cli_data.cxx |   17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 961ebbe9ebd9becdefdeaa5fdea63cb0e7d27443
Author:     Julien Nabet <serval2412 at yahoo.fr>
AuthorDate: Wed Oct 6 21:28:16 2021 +0200
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Thu Oct 7 13:38:06 2021 +0200

    drop 'using namespace std' in cli_ure
    
    Change-Id: Ib439d74284d52e32162164d14ab06e4f40df884a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123193
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/cli_ure/source/uno_bridge/cli_data.cxx b/cli_ure/source/uno_bridge/cli_data.cxx
index f321549da31e..72b39df4884f 100644
--- a/cli_ure/source/uno_bridge/cli_data.cxx
+++ b/cli_ure/source/uno_bridge/cli_data.cxx
@@ -42,7 +42,6 @@ namespace sr = System::Reflection;
 namespace st = System::Text;
 namespace ucss = unoidl::com::sun::star;
 
-using namespace std;
 
 namespace cli_uno
 {
@@ -51,9 +50,9 @@ OUString mapCliTypeName(System::String^ typeName);
 System::String^ mapCliPolymorphicName(System::String^ unoName);
 System::String^ mapPolymorphicName(System::String^ unoName, bool bCliToUno);
 
-inline unique_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32 nSize )
+inline std::unique_ptr< rtl_mem > seq_allocate( sal_Int32 nElements, sal_Int32 nSize )
 {
-    unique_ptr< rtl_mem > seq(
+    std::unique_ptr< rtl_mem > seq(
         rtl_mem::allocate( SAL_SEQUENCE_HEADER_SIZE + (nElements * nSize) ) );
     uno_Sequence * p = (uno_Sequence *)seq.get();
     p->nRefCount = 1;
@@ -899,7 +898,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                     }
                     else
                     {
-                        unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (sal_Int64) ) );
+                        std::unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (sal_Int64) ) );
                         *(sal_Int64 *) mem.get()=  *safe_cast<System::Int64^>(aAny.Value);
                         pAny->pData = mem.release();
                     }
@@ -912,7 +911,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                     }
                     else
                     {
-                        unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (sal_uInt64) ) );
+                        std::unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (sal_uInt64) ) );
                         *(sal_uInt64 *) mem.get()=  *safe_cast<System::UInt64^>(aAny.Value);
                         pAny->pData = mem.release();
                     }
@@ -925,7 +924,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                     }
                     else
                     {
-                        unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (float) ) );
+                        std::unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (float) ) );
                         *(float*) mem.get() = *safe_cast<System::Single^>(aAny.Value);
                         pAny->pData = mem.release();
                     }
@@ -938,7 +937,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                     }
                     else
                     {
-                        unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (double) ) );
+                        std::unique_ptr< rtl_mem > mem( rtl_mem::allocate( sizeof (double) ) );
                         *(double*) mem.get()= *safe_cast<System::Double^>(aAny.Value);
                         pAny->pData= mem.release();
                     }
@@ -967,7 +966,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
                     css::uno::Type anyType(value_td);
                     typelib_TypeDescription* td= NULL;
                     anyType.getDescription(&td);
-                    unique_ptr< rtl_mem > mem(rtl_mem::allocate(td->nSize));
+                    std::unique_ptr< rtl_mem > mem(rtl_mem::allocate(td->nSize));
                     typelib_typedescription_release(td);
                     map_to_uno(
                         mem.get(), aAny.Value, value_td.getTypeLibType(),
@@ -1219,7 +1218,7 @@ void Bridge::map_to_uno(void * uno_data, System::Object^ cli_data,
             typelib_TypeDescriptionReference * element_type =
                 ((typelib_IndirectTypeDescription *)td.get())->pType;
 
-            unique_ptr< rtl_mem > seq;
+            std::unique_ptr< rtl_mem > seq;
 
             System::Array^ ar = nullptr;
             if (cli_data != nullptr)


More information about the Libreoffice-commits mailing list