From 013d9789c753d46f0a038e54db6e21f4d4922891 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 15 Feb 2017 22:31:33 +0200 Subject: Drop :: prefix from std in [a-b]*/ Change-Id: I0422aaf39bbce889c95ed9a81a0784cb03a1badd Reviewed-on: https://gerrit.libreoffice.org/34320 Tested-by: Jenkins Reviewed-by: Tor Lillqvist --- bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_arm/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_intel/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_mips/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_s390/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx | 6 +++--- bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx | 6 +++--- bridges/source/cpp_uno/shared/vtablefactory.cxx | 2 +- bridges/source/jni_uno/jni_base.h | 4 ++-- bridges/source/jni_uno/jni_info.h | 2 +- 20 files changed, 55 insertions(+), 55 deletions(-) (limited to 'bridges') diff --git a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx index 65d7f6442294..ce2a34c417f9 100644 --- a/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_aix_powerpc/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx index c12f148e6ffd..dc199bdc1b94 100644 --- a/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_alpha/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx index 9c254914d400..99cf7766a0c4 100644 --- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx @@ -34,11 +34,11 @@ namespace CPPU_CURRENT_NAMESPACE struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx index 5d868e5ddff3..dd084e340a1e 100644 --- a/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_hppa/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx index 1b24c9253b4b..59ff09b72621 100644 --- a/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_ia64/share.hxx @@ -44,11 +44,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx index f97e81e419eb..d167bf25c584 100644 --- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx @@ -42,11 +42,11 @@ void dummy_can_throw_anything( char const * ); struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx index 25d618331b06..01655c480e1d 100644 --- a/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_m68k/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx index 0d3a6b34326d..5c4dac85b249 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx index 03badeb2e096..73c60aa05abc 100644 --- a/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_mips64/share.hxx @@ -46,11 +46,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx index 8c8793acd446..be81af026eac 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx index b5f609adc39a..21df650f7ae0 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx index 54e16de04941..aacbd05fa568 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx index 2828a2927eac..9de4b6f485f6 100644 --- a/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_s390x/share.hxx @@ -43,11 +43,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx index 116e3fa16244..95f0c15f660c 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc/share.hxx @@ -38,11 +38,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx b/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx index 65dcba617551..5cd1b32f6355 100644 --- a/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx +++ b/bridges/source/cpp_uno/gcc3_linux_sparc64/share.hxx @@ -38,11 +38,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx index 0f6c5469bf73..0fe413f6827c 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx +++ b/bridges/source/cpp_uno/gcc3_solaris_intel/share.hxx @@ -42,11 +42,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx index 515062192f7e..af42fba6a4ba 100644 --- a/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx +++ b/bridges/source/cpp_uno/gcc3_solaris_sparc/share.hxx @@ -38,11 +38,11 @@ struct _Unwind_Exception struct __cxa_exception { - ::std::type_info *exceptionType; + std::type_info *exceptionType; void (*exceptionDestructor)(void *); - ::std::unexpected_handler unexpectedHandler; - ::std::terminate_handler terminateHandler; + std::unexpected_handler unexpectedHandler; + std::terminate_handler terminateHandler; __cxa_exception *nextException; diff --git a/bridges/source/cpp_uno/shared/vtablefactory.cxx b/bridges/source/cpp_uno/shared/vtablefactory.cxx index eecedbbb61cb..7f524df6d1d5 100644 --- a/bridges/source/cpp_uno/shared/vtablefactory.cxx +++ b/bridges/source/cpp_uno/shared/vtablefactory.cxx @@ -360,7 +360,7 @@ sal_Int32 VtableFactory::createVtables( #ifdef USE_DOUBLE_MMAP //Finished generating block, swap writable pointer with executable //pointer - ::std::swap(block.start, block.exec); + std::swap(block.start, block.exec); #endif blocks.push_back(block); } catch (...) { diff --git a/bridges/source/jni_uno/jni_base.h b/bridges/source/jni_uno/jni_base.h index a84701d3f2ff..5f4ada393d34 100644 --- a/bridges/source/jni_uno/jni_base.h +++ b/bridges/source/jni_uno/jni_base.h @@ -213,10 +213,10 @@ struct rtl_mem inline static void operator delete ( void *, void * ) {} - static inline rtl_mem * allocate( ::std::size_t bytes ); + static inline rtl_mem * allocate( std::size_t bytes ); }; -inline rtl_mem * rtl_mem::allocate( ::std::size_t bytes ) +inline rtl_mem * rtl_mem::allocate( std::size_t bytes ) { void * p = rtl_allocateMemory( bytes ); if (nullptr == p) diff --git a/bridges/source/jni_uno/jni_info.h b/bridges/source/jni_uno/jni_info.h index eea1f562e009..1abc05160876 100644 --- a/bridges/source/jni_uno/jni_info.h +++ b/bridges/source/jni_uno/jni_info.h @@ -118,7 +118,7 @@ struct JNI_type_info_holder inline JNI_type_info_holder() : m_info( nullptr ) {} }; -typedef ::std::unordered_map< +typedef std::unordered_map< OUString, JNI_type_info_holder, OUStringHash > t_str2type; class JNI_info -- cgit