From 9b9a0f15f1fea6f7af36f20f1a3925a87d5e6799 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 11:24:24 +0100 Subject: Removed ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR, all compilers have working explicit template destructors now * ACE/ace/Global_Macros.h: * ACE/ace/README: * ACE/ace/config-g++-common.h: * ACE/ace/config-hpux-11.00.h: * ACE/ace/config-icc-common.h: * ACE/ace/config-macosx-leopard.h: * ACE/ace/config-macosx-tiger.h: * ACE/ace/config-suncc-common.h: * ACE/ace/config-win32-msvc-14.h: --- ACE/ace/Global_Macros.h | 90 ----------------------------------------- ACE/ace/README | 4 -- ACE/ace/config-g++-common.h | 1 - ACE/ace/config-hpux-11.00.h | 2 - ACE/ace/config-icc-common.h | 1 - ACE/ace/config-macosx-leopard.h | 2 - ACE/ace/config-macosx-tiger.h | 2 - ACE/ace/config-suncc-common.h | 1 - ACE/ace/config-win32-msvc-14.h | 1 - 9 files changed, 104 deletions(-) diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 2ad696e42cf..8c8b1329ebb 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -235,7 +235,6 @@ } \ while (0) -# if defined (ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR) # define ACE_DES_NOFREE_TEMPLATE(POINTER,T_CLASS,T_PARAMETER) \ do { \ if (POINTER) \ @@ -370,95 +369,6 @@ } \ } \ while (0) -# else /* ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */ -# define ACE_DES_NOFREE_TEMPLATE(POINTER,T_CLASS,T_PARAMETER) \ - do { \ - if (POINTER) \ - { \ - (POINTER)->T_CLASS T_PARAMETER::~T_CLASS (); \ - } \ - } \ - while (0) -# define ACE_DES_ARRAY_NOFREE_TEMPLATE(POINTER,SIZE,T_CLASS,T_PARAMETER) \ - do { \ - if (POINTER) \ - { \ - for (size_t i = 0; \ - i < SIZE; \ - ++i) \ - { \ - (POINTER)[i].T_CLASS T_PARAMETER::~T_CLASS (); \ - } \ - } \ - } \ - while (0) -# define ACE_DES_FREE_TEMPLATE(POINTER,DEALLOCATOR,T_CLASS,T_PARAMETER) \ - do { \ - if (POINTER) \ - { \ - POINTER->T_CLASS T_PARAMETER::~T_CLASS (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -# define ACE_DES_ARRAY_FREE_TEMPLATE(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAMETER) \ - do { \ - if (POINTER) \ - { \ - for (size_t i = 0; \ - i < SIZE; \ - ++i) \ - { \ - POINTER[i].T_CLASS T_PARAMETER::~T_CLASS (); \ - } \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -# define ACE_DES_FREE_TEMPLATE2(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \ - do { \ - if (POINTER) \ - { \ - POINTER->T_CLASS ::~T_CLASS (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -# define ACE_DES_FREE_TEMPLATE3(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3) \ - do { \ - if (POINTER) \ - { \ - POINTER->T_CLASS ::~T_CLASS (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -# define ACE_DES_FREE_TEMPLATE4(POINTER,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2,T_PARAM3,T_PARAM4) \ - do { \ - if (POINTER) \ - { \ - POINTER->T_CLASS ::~T_CLASS (); \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -# define ACE_DES_ARRAY_FREE_TEMPLATE2(POINTER,SIZE,DEALLOCATOR,T_CLASS,T_PARAM1,T_PARAM2) \ - do { \ - if (POINTER) \ - { \ - for (size_t i = 0; \ - i < SIZE; \ - ++i) \ - { \ - POINTER[i].T_CLASS ::~T_CLASS (); \ - } \ - DEALLOCATOR (POINTER); \ - } \ - } \ - while (0) -# endif /* defined ! ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR */ - - /*******************************************************************/ /// Service Objects, i.e., objects dynamically loaded via the service diff --git a/ACE/ace/README b/ACE/ace/README index e975426f438..8f5ba36d9e0 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -230,10 +230,6 @@ ACE_HAS_AUTOMATIC_INIT_FINI Compiler/platform correctly ACE_HAS_BIG_FD_SET Compiler/platform has typedef u_long fdmask (e.g., Linux and SCO). -ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - Compiler handles explicit calling of - template destructor correctly. See - "ace/OS.h" for details. ACE_HAS_BROKEN_ACCEPT_ADDR Platform can't correctly deal with a NULL addr to accept() (e.g, VxWorks < 6.9). diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 50daf671852..6e58e317f1d 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -17,7 +17,6 @@ #define ACE_HAS_CPLUSPLUS_HEADERS #define ACE_HAS_STDCPP_STL_INCLUDES #define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #define ACE_TEMPLATES_REQUIRE_SOURCE #define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 23d754068db..396723d48b7 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -47,8 +47,6 @@ # define ACE_LACKS_NUMERIC_LIMITS # endif /* _HP_NAMESPACE_STD */ -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - // Platform lacks streambuf "linebuffered ()". # define ACE_LACKS_LINEBUFFERED_STREAMBUF 1 diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index 4fab19823d6..084467dd1d6 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -6,7 +6,6 @@ # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES # define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_STRING_CLASS diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h index be7627c39a3..a5ef02f6675 100644 --- a/ACE/ace/config-macosx-leopard.h +++ b/ACE/ace/config-macosx-leopard.h @@ -25,8 +25,6 @@ #define ACE_ISCTYPE_EQUIVALENT __isctype -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - #define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if !defined (__i386__) diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h index 24c6e2d3917..1c2a37c5293 100644 --- a/ACE/ace/config-macosx-tiger.h +++ b/ACE/ace/config-macosx-tiger.h @@ -16,8 +16,6 @@ # include "ace/config-g++-common.h" #endif /* __GNUG__ */ -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR - #define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #if !defined (__i386__) diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index ff4d38c4236..83017a73eec 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -6,7 +6,6 @@ # define ACE_HAS_CPLUSPLUS_HEADERS # define ACE_HAS_STDCPP_STL_INCLUDES # define ACE_HAS_STANDARD_CPP_LIBRARY 1 -# define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_HAS_STRING_CLASS # define ACE_EXPLICIT_TEMPLATE_DESTRUCTOR_TAKES_ARGS diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index fbbc5fa15ec..5815263e7f5 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -42,7 +42,6 @@ #define ACE_HAS_ITOA #define ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE -#define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR #define ACE_ITOA_EQUIVALENT ::_itoa #define ACE_STRCASECMP_EQUIVALENT ::_stricmp -- cgit v1.2.1