From 8a11e3c87a0e7bffe52754644ea6a243b1b9aee5 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 10:58:06 +0100 Subject: Remove ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE, not needed anymore * ACE/ace/README: * ACE/ace/config-win32-msvc-14.h: * TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp: * TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp: --- ACE/ace/README | 6 ------ ACE/ace/config-win32-msvc-14.h | 1 - TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp | 2 +- TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp | 16 ++-------------- 4 files changed, 3 insertions(+), 22 deletions(-) diff --git a/ACE/ace/README b/ACE/ace/README index e975426f438..f515468237e 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -140,12 +140,6 @@ ACE_HAS_ALT_CUSERID Use ACE's alternate cuserid() undefined and that the geteuid() system call exists. ACE_HAS_DINKUM_STL Using the Dinkum STL library -ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE - Non-C++ Compliant compilers that automatically - provide storage for class static const int - when their declaration is seen. I.e. they object - to explicit definitions being seen in the .cpp - file. ACE_DEFAULT_THREAD_KEYS Number of TSS keys, with ACE_HAS_TSS_EMULATION _only_. Defaults to 64. diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index fbbc5fa15ec..6f854d17cd0 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -41,7 +41,6 @@ #endif #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 diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp index ef25afde9ca..091a149ef13 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_ch.cpp @@ -109,7 +109,7 @@ be_visitor_constant_ch::visit_constant (be_constant *node) } // If this is true, can't generate inline constants. - bool forbidden_in_class = (snt != AST_Decl::NT_root + bool const forbidden_in_class = (snt != AST_Decl::NT_root && snt != AST_Decl::NT_module && (etype == AST_Expression::EV_string || etype == AST_Expression::EV_wstring diff --git a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp index 1db7973d95f..d8d063c3aa0 100644 --- a/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_constant/constant_cs.cpp @@ -36,12 +36,12 @@ be_visitor_constant_cs::visit_constant (be_constant *node) && snt != AST_Decl::NT_module); if (be_global->gen_inline_constants () && !in_class) { - // No storeage is required in the source file for these + // No storage is required in the source file for these return 0; } AST_Expression::ExprType etype = node->et (); - bool forbidden_in_class = (in_class + bool const forbidden_in_class = (in_class && (etype == AST_Expression::EV_string || etype == AST_Expression::EV_wstring || etype == AST_Expression::EV_float @@ -54,13 +54,6 @@ be_visitor_constant_cs::visit_constant (be_constant *node) << "// " << __FILE__ << ":" << __LINE__; *os << be_nl_2; - if (be_global->gen_inline_constants () && !forbidden_in_class) - { - // Some compilers (especially Microsoft) always define storage - // when the initialiser is given, therefore the header has already - // done this (which is non-C++ complient by the way). - *os << "#ifndef ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE" << be_nl << " "; - } *os << "const "; if (node->et () == AST_Expression::EV_enum) @@ -81,11 +74,6 @@ be_visitor_constant_cs::visit_constant (be_constant *node) } *os << ";"; - if (be_global->gen_inline_constants () && !forbidden_in_class) - { - *os << be_nl << "#endif // ifndef ACE_HAS_HEADER_ALLOCATED_CLASS_STATIC_CONST_INT_STOREAGE"; - } - node->cli_stub_gen (true); return 0; } -- cgit v1.2.1 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 From 748e8d4a4a4008e601e6d485952886c9bf688e24 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 11:29:05 +0100 Subject: Removed ACE_NEEDS_FUNC_DEFINITIONS, not used anymore * ACE/ace/README: * ACE/ace/config-integritySCA.h: * ACE/ace/config-qnx.h: * ACE/ace/config-win32-msvc-14.h: --- ACE/ace/README | 8 -------- ACE/ace/config-integritySCA.h | 1 - ACE/ace/config-qnx.h | 1 - ACE/ace/config-win32-msvc-14.h | 4 ---- 4 files changed, 14 deletions(-) diff --git a/ACE/ace/README b/ACE/ace/README index e975426f438..9d78474aebc 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -1067,14 +1067,6 @@ ACE_LACKS_WRITEV Platform doesn't define ACE_NEEDS_DEV_IO_CONVERSION Necessary with some compilers to pass ACE_TTY_IO as parameter to DEV_Connector. -ACE_NEEDS_FUNC_DEFINITIONS Compiler requires a definition - for a "hidden" function, e.g., - a private, unimplemented copy - constructor or assignment - operator. The SGI C++ - compiler needs this, in - template classes, with - ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA. ACE_NEEDS_HUGE_THREAD_STACKSIZE Required by platforms with small default stacks. ACE_NEEDS_LWP_PRIO_SET OS has LWPs, and when the diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h index 98679878ca8..ed91e91d298 100644 --- a/ACE/ace/config-integritySCA.h +++ b/ACE/ace/config-integritySCA.h @@ -28,7 +28,6 @@ #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #define ACE_TEMPLATES_REQUIRE_SOURCE 1 #define TAO_USE_SEQUENCE_TEMPLATES -#define ACE_NEEDS_FUNC_DEFINITIONS #define _REENTRANT #define ACE_MT_SAFE 1 diff --git a/ACE/ace/config-qnx.h b/ACE/ace/config-qnx.h index 4b9024b5c8e..b760c2b5ad5 100644 --- a/ACE/ace/config-qnx.h +++ b/ACE/ace/config-qnx.h @@ -156,7 +156,6 @@ #define ACE_LACKS_RLIMIT // QNX rlimit syscalls don't work properly with ACE. #define ACE_MT_SAFE 1 -#define ACE_NEEDS_FUNC_DEFINITIONS #define ACE_NEEDS_HUGE_THREAD_STACKSIZE 64000 #define ACE_THR_PRI_FIFO_DEF 10 #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 diff --git a/ACE/ace/config-win32-msvc-14.h b/ACE/ace/config-win32-msvc-14.h index fbbc5fa15ec..fb0a844abe5 100644 --- a/ACE/ace/config-win32-msvc-14.h +++ b/ACE/ace/config-win32-msvc-14.h @@ -129,10 +129,6 @@ // A template can not be exported. Only an instantiation may be exported. #define ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT -// At least for ACE_UNIMPLEMENTED_FUNC in class templates, this is needed to -// explicitly instantiate a template that has ACE_UNIMPLEMENTED_FUNC. -# define ACE_NEEDS_FUNC_DEFINITIONS - // Windows Vista and Windows Server 2008 and newer do have native condition // variables, but this is commented out because the support in ACE hasn't // been completed -- cgit v1.2.1 From 413f1843adab1a8d6de8c3925da2e86a4e0f44e5 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 11:32:45 +0100 Subject: Fixed comment * ACE/ace/High_Res_Timer.cpp: --- ACE/ace/High_Res_Timer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index a803982ef0f..17344b409a2 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -226,7 +226,7 @@ ACE_High_Res_Timer::global_scale_factor () # else ACE_High_Res_Timer::global_scale_factor (ACE_High_Res_Timer::get_cpuinfo ()); # endif /* ACE_LACKS_SSCANF */ -# endif /* ! ACE_WIN32 && ! (ACE_LINUX && __alpha__) */ +# endif /* !ACE_WIN32 && !ACE_LINUX */ # if !defined (ACE_WIN32) if (ACE_High_Res_Timer::global_scale_factor_ <= 1u) -- cgit v1.2.1 From c5a4c88c2ed5a5dac4ebe4aed6b1868e19ab39ed Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 11:39:07 +0100 Subject: Remove support for the Alpha CPU * ACE/ACE-INSTALL.html: * ACE/NEWS: * ACE/ace/Basic_Types.h: * ACE/ace/High_Res_Timer.cpp: * ACE/ace/OS_NS_time.inl: * ACE/ace/README: * ACE/ace/config-linux-common.h: * ACE/tests/Auto_Event_Test.cpp: * ACE/tests/Semaphore_Test.cpp: * TAO/tests/Time_Policy/main.cpp: --- ACE/ACE-INSTALL.html | 6 +++--- ACE/NEWS | 2 ++ ACE/ace/Basic_Types.h | 2 +- ACE/ace/High_Res_Timer.cpp | 29 +++++------------------------ ACE/ace/OS_NS_time.inl | 16 ---------------- ACE/ace/README | 3 --- ACE/ace/config-linux-common.h | 2 +- ACE/tests/Auto_Event_Test.cpp | 2 +- ACE/tests/Semaphore_Test.cpp | 2 +- TAO/tests/Time_Policy/main.cpp | 1 - 10 files changed, 14 insertions(+), 51 deletions(-) diff --git a/ACE/ACE-INSTALL.html b/ACE/ACE-INSTALL.html index 45d215f7528..0b7bb001acb 100644 --- a/ACE/ACE-INSTALL.html +++ b/ACE/ACE-INSTALL.html @@ -185,7 +185,7 @@ document.

Windows CE, MinGW, Microsoft Visual C++, GCC, Cygwin, VxWorks 6.x (kernel and rtp), OpenVMS on IA64, BlueCAT Linux, RedHat Linux, Fedora, MacOSX, Solaris, - Tru64, SuSE Linux on Alpha/IA32/EM64T/IA64, RTEMS, QNX, LynxOS, + Tru64, SuSE Linux on IA32/EM64T/IA64, RTEMS, QNX, LynxOS, HPUX on IA64, and Android. The Intel C++ compiler is supported on Windows 32/64bit, Linux IA32/EM64T/IA64, MacOSX. @@ -2187,10 +2187,10 @@ libraries.

  • Linux

    ACE has been ported to Linux on - Intel, Alpha, and PowerPC platforms. If you use a RedHat 5.x + Intel, PowerPC platforms. If you use a RedHat 5.x distribution, it's best to use RedHat 5.1 or later. ACE works without any modifications on RedHat 5.1 and later, and on - Debian 2.1 on both Intel and Alpha. Use the + Debian 2.1 on Intel. Use the platform_linux.GNU and ace/config-linux.h in your platform_macros.GNU and config.h files, respectively. The same diff --git a/ACE/NEWS b/ACE/NEWS index 5406504f6d0..4f2bf9e45ba 100644 --- a/ACE/NEWS +++ b/ACE/NEWS @@ -50,6 +50,8 @@ USER VISIBLE CHANGES BETWEEN ACE-6.5.12 and ACE-7.0.0 to LLD and you want to use the GNU linkers, put `androind_set_lld := 0` in `platform_macros.GNU`. +. Removed support for the Alpha CPU + USER VISIBLE CHANGES BETWEEN ACE-6.5.11 and ACE-6.5.12 ====================================================== diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index 7fec1b2f188..dfff2f97615 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -268,7 +268,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL // Note that Itanium hardware (IA64) can run in either byte order. It's // selected by the OS when loading; Windows runs little, HP-UX runs big. # if defined (i386) || defined (__i386__) || defined (_M_IX86) || \ - defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) || \ + defined (vax) || defined (__LITTLE_ENDIAN__) || \ defined (ARM) || defined (_M_IA64) || defined (_M_AMD64) || \ defined (__amd64) || \ ((defined (__ia64__) || defined (__ia64)) && !defined (__hpux)) diff --git a/ACE/ace/High_Res_Timer.cpp b/ACE/ace/High_Res_Timer.cpp index a803982ef0f..cdf95737417 100644 --- a/ACE/ace/High_Res_Timer.cpp +++ b/ACE/ace/High_Res_Timer.cpp @@ -30,7 +30,7 @@ ACE_END_VERSIONED_NAMESPACE_DECL // ACE_OS::gethrtime. We'll still set this to one to prevent division // by zero errors. #if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \ - defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \ + defined (ACE_HAS_PENTIUM)) && \ !defined (ACE_HAS_HI_RES_TIMER) # include "ace/Guard_T.h" @@ -48,7 +48,7 @@ ACE_High_Res_Timer::global_scale_factor_type ACE_High_Res_Timer::global_scale_fa ACE_END_VERSIONED_NAMESPACE_DECL #else /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ - ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) || + ACE_HAS_PENTIUM) || ACE_HAS_HI_RES_TIMER */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -60,7 +60,7 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ! (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ - ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) || + ACE_HAS_PENTIUM) || ACE_HAS_HI_RES_TIMER */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -82,9 +82,7 @@ ACE_High_Res_Timer::get_cpuinfo () // the BogoMips, as described in the BogoMips mini-HOWTO. Note that // this code assumes an order to the /proc/cpuinfo contents. The // BogoMips rating had better come after CPU type and model info. -#if !defined (__alpha__) bool supported = false; -#endif /* __alpha__ */ FILE *cpuinfo = ACE_OS::fopen (ACE_TEXT ("/proc/cpuinfo"), ACE_TEXT ("r")); @@ -97,22 +95,6 @@ ACE_High_Res_Timer::get_cpuinfo () while (ACE_OS::fgets (buf, sizeof buf, cpuinfo)) { -#if defined (__alpha__) - ACE_UINT32 whole; - ACE_UINT32 fractional; - if (::sscanf (buf, - "BogoMIPS : %d.%d\n", - &whole, - &fractional) == 2 - || ::sscanf (buf, - "bogomips : %d.%d\n", - &whole, - &fractional) == 2) - { - scale_factor = whole; - break; - } -#else double mhertz = 1; double bmips = 1; char arg[128]; @@ -173,7 +155,6 @@ ACE_High_Res_Timer::get_cpuinfo () #endif /* 0 */ break; } -#endif /* __alpha__ */ } // ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT (" (done)\n"))); @@ -189,7 +170,7 @@ ACE_High_Res_Timer::global_scale_factor_type ACE_High_Res_Timer::global_scale_factor () { #if (defined (ACE_WIN32) || defined (ACE_HAS_POWERPC_TIMER) || \ - defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER)) && \ + defined (ACE_HAS_PENTIUM)) && \ !defined (ACE_HAS_HI_RES_TIMER) && \ (defined (ACE_WIN32) || \ defined (ghs) || defined (__GNUG__) || \ @@ -244,7 +225,7 @@ ACE_High_Res_Timer::global_scale_factor () } #endif /* (ACE_WIN32 || ACE_HAS_POWERPC_TIMER || \ - ACE_HAS_PENTIUM || ACE_HAS_ALPHA_TIMER) && \ + ACE_HAS_PENTIUM) && \ ! ACE_HAS_HI_RES_TIMER && ((WIN32 && ! WINCE) || ghs || __GNUG__) */ diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl index 2214a6c873d..0e265607231 100644 --- a/ACE/ace/OS_NS_time.inl +++ b/ACE/ace/OS_NS_time.inl @@ -293,22 +293,6 @@ ACE_OS::gethrtime (const ACE_HRTimer_Op op) asm volatile ("rdtsc" : "=A" (now) : : "memory"); # endif - return now; -#elif defined (ACE_LINUX) && defined (ACE_HAS_ALPHA_TIMER) - // NOTE: alphas only have a 32 bit tick (cycle) counter. The rpcc - // instruction actually reads 64 bits, but the high 32 bits are - // implementation-specific. Linux and Digital Unix, for example, - // use them for virtual tick counts, i.e., taking into account only - // the time that the process was running. This information is from - // David Mosberger's article, see comment below. - ACE_UINT32 now; - - // The following statement is based on code published by: - // Mosberger, David, "How to Make Your Applications Fly, Part 1", - // Linux Journal Issue 42, October 1997, page 50. It reads the - // high-res tick counter directly into the memory variable. - asm volatile ("rpcc %0" : "=r" (now) : : "memory"); - return now; #elif defined (ACE_HAS_POWERPC_TIMER) && (defined (ghs) || defined (__GNUG__)) // PowerPC w/ GreenHills or g++. diff --git a/ACE/ace/README b/ACE/ace/README index e975426f438..bb24ab2d52f 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -221,9 +221,6 @@ ACE_HAS_ALLOCA Compiler/platform supports alloca() ACE_HAS_ALLOCA_H Compiler/platform has -ACE_HAS_ALPHA_TIMER CPU is an Alpha, with the rpcc - instruction to read the tick timer. - Limited to 32 bits, so not recommended. ACE_HAS_AUTOMATIC_INIT_FINI Compiler/platform correctly calls init()/fini() for shared libraries diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 23e0f579594..87af053f04c 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -184,7 +184,7 @@ # define ACE_HAS_STRBUF_T #endif -#if defined (__ia64) || defined(__alpha) || defined (__x86_64__) || defined(__powerpc64__) || (defined(__mips__) && defined(__LP64__)) || defined (__aarch64__) +#if defined (__ia64) || defined (__x86_64__) || defined(__powerpc64__) || (defined(__mips__) && defined(__LP64__)) || defined (__aarch64__) // On 64 bit platforms, the "long" type is 64-bits. Override the // default 32-bit platform-specific format specifiers appropriately. # define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu" diff --git a/ACE/tests/Auto_Event_Test.cpp b/ACE/tests/Auto_Event_Test.cpp index e7449c740c0..7b7d2828a43 100644 --- a/ACE/tests/Auto_Event_Test.cpp +++ b/ACE/tests/Auto_Event_Test.cpp @@ -23,7 +23,7 @@ // msec that times are allowed to differ before test fails. #if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \ - defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER) || \ + defined (ACE_HAS_PENTIUM) || \ defined (ACE_HAS_POWERPC_TIMER) # define ACE_ALLOWED_SLACK 100 #else /* don't have a high-res timer */ diff --git a/ACE/tests/Semaphore_Test.cpp b/ACE/tests/Semaphore_Test.cpp index 1308cb7ecdb..d43318c96aa 100644 --- a/ACE/tests/Semaphore_Test.cpp +++ b/ACE/tests/Semaphore_Test.cpp @@ -21,7 +21,7 @@ // msec that times are allowed to differ before test fails. #if defined (ACE_HAS_HI_RES_TIMER) || defined (ACE_HAS_AIX_HI_RES_TIMER) || \ - defined (ACE_HAS_PENTIUM) || defined (ACE_HAS_ALPHA_TIMER) || \ + defined (ACE_HAS_PENTIUM) || \ defined (ACE_HAS_POWERPC_TIMER) # define ACE_ALLOWED_SLACK 100 #else /* don't have a high-res timer */ diff --git a/TAO/tests/Time_Policy/main.cpp b/TAO/tests/Time_Policy/main.cpp index b53b5df8a02..65e88b1e611 100644 --- a/TAO/tests/Time_Policy/main.cpp +++ b/TAO/tests/Time_Policy/main.cpp @@ -25,7 +25,6 @@ defined (ACE_WIN32) || \ (defined (ghs) && defined (ACE_HAS_PENTIUM)) || \ ((defined (__GNUG__) || defined (__INTEL_COMPILER)) && !defined(ACE_VXWORKS) && defined (ACE_HAS_PENTIUM)) || \ - (defined (ACE_LINUX) && defined (ACE_HAS_ALPHA_TIMER)) || \ (defined (ACE_HAS_POWERPC_TIMER) && (defined (ghs) || defined (__GNUG__))) || \ (defined (ACE_HAS_CLOCK_GETTIME) && defined (ACE_HAS_CLOCK_GETTIME_MONOTONIC))) -- cgit v1.2.1 From d9c64b63350b0d3c7b1c53df04ede55b984cda32 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 12:01:11 +0100 Subject: Fixed typo in comment * ACE/ace/config-macros.h: --- ACE/ace/config-macros.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ACE/ace/config-macros.h b/ACE/ace/config-macros.h index 528f4451497..89f7e4512e4 100644 --- a/ACE/ace/config-macros.h +++ b/ACE/ace/config-macros.h @@ -81,7 +81,7 @@ # endif /* ACE_HAS_VALGRIND */ // ========================================================================= -// Perfect Multicast filting refers to RFC 3376, where a socket is only +// Perfect Multicast filtering refers to RFC 3376, where a socket is only // delivered dgrams for groups joined even if it didn't bind the group // address. We turn this option off by default, although most OS's // except for Windows and Solaris probably lack perfect filtering. -- cgit v1.2.1 From 28c4d31ef159f66b7e0c7eb4b24003aca8d31aa7 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 12:04:24 +0100 Subject: Remove some left over psos comments * ACE/ace/OS_main.h: * ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h: --- ACE/ace/OS_main.h | 2 +- ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ACE/ace/OS_main.h b/ACE/ace/OS_main.h index 4dd48ffa794..5a15bac6a27 100644 --- a/ACE/ace/OS_main.h +++ b/ACE/ace/OS_main.h @@ -302,7 +302,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdLi } \ int ace_main_i -# endif /* ACE_PSOSIM */ +# endif # endif /* ACE_HAS_NONSTATIC_OBJECT_MANAGER && !ACE_HAS_WINCE && !ACE_DOESNT_INSTANTIATE_NONSTATIC_OBJECT_MANAGER */ # ifdef ACE_MQX diff --git a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h index 3567e4c897f..9576356d5fd 100644 --- a/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h +++ b/ACE/protocols/tests/HTBP/Reactor_Tests/test_config.h @@ -173,9 +173,9 @@ inline ACE_Test_Output::ACE_Test_Output (void) inline ACE_Test_Output::~ACE_Test_Output (void) { -#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) && !defined (ACE_PSOS) +#if !defined (ACE_LACKS_IOSTREAM_TOTALLY) ACE_LOG_MSG->msg_ostream (&cerr); -#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY && ! ACE_PSOS */ +#endif /* ! ACE_LACKS_IOSTREAM_TOTALLY */ ACE_LOG_MSG->clr_flags (ACE_Log_Msg::OSTREAM); ACE_LOG_MSG->set_flags (ACE_Log_Msg::STDERR); -- cgit v1.2.1 From ef581b6d38d0feba6956cacb3e409c271a302f72 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 12:06:57 +0100 Subject: Removed checks for DEC_CXX * TAO/tests/Crashed_Callback/Crashed_Callback.cpp: * TAO/tests/Faults/test_i.cpp: --- TAO/tests/Crashed_Callback/Crashed_Callback.cpp | 2 +- TAO/tests/Faults/test_i.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp index bd41b09e3f9..b76d85f7670 100644 --- a/TAO/tests/Crashed_Callback/Crashed_Callback.cpp +++ b/TAO/tests/Crashed_Callback/Crashed_Callback.cpp @@ -17,7 +17,7 @@ Crashed_Callback::crash_now_please (void) "(%P|%t) Crashed_Callback - crashing application\n")); // OpenVMS seems to hang and not abort and dump core when abort() is called // here. This needs further -#if defined (DEC_CXX) || defined (ACE_OPENVMS) +#if defined (ACE_OPENVMS) ACE_OS::_exit(); #else ACE_OS::abort(); diff --git a/TAO/tests/Faults/test_i.cpp b/TAO/tests/Faults/test_i.cpp index 449e6db1780..a55e19ca977 100644 --- a/TAO/tests/Faults/test_i.cpp +++ b/TAO/tests/Faults/test_i.cpp @@ -15,7 +15,7 @@ Callback_i::shutdown (CORBA::Boolean is_clean) // OpenVMS seems to hang and not abort and dump core when abort() is called // here. This needs further investigation. -#if defined (DEC_CXX) || defined (ACE_OPENVMS) +#if defined (ACE_OPENVMS) ACE_OS::_exit(); #else ACE_OS::abort(); @@ -51,7 +51,7 @@ Simple_Server_i::shutdown_now (CORBA::Boolean is_clean) if (is_clean == 0) { ACE_DEBUG ((LM_DEBUG, "Performing catastrophic shutdown\n")); -#if defined (DEC_CXX) || defined (ACE_OPENVMS) +#if defined (ACE_OPENVMS) ACE_OS::_exit(); #else ACE_OS::abort(); -- cgit v1.2.1 From 79e8b2ebe936cf19477380842f40d32191c16bc2 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 13:20:56 +0100 Subject: Removed ACE_ENDLESS_LOOP, not used * ACE/ace/Global_Macros.h: * ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp: --- ACE/ace/Global_Macros.h | 4 ---- ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp | 2 -- 2 files changed, 6 deletions(-) diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 2ad696e42cf..9fb08937334 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -57,10 +57,6 @@ # define ACE_SET_BITS(WORD, BITS) (WORD |= (BITS)) # define ACE_CLR_BITS(WORD, BITS) (WORD &= ~(BITS)) -# if !defined (ACE_ENDLESS_LOOP) -# define ACE_ENDLESS_LOOP -# endif /* ! ACE_ENDLESS_LOOP */ - #if !defined (ACE_HAS_CPP11) # error ACE/TAO require C++11 compliance, please upgrade your compiler and/or fix the platform configuration for your environment #endif /* !ACE_HAS_CPP11 */ diff --git a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp index cb4516b7b4d..9b3d40111bd 100644 --- a/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp +++ b/ACE/examples/IPC_SAP/SOCK_SAP/CPP-inserver-poll.cpp @@ -181,8 +181,6 @@ ACE_TMAIN (int, ACE_TCHAR *[]) for (size_t n_handles = 1;;) { - ACE_ENDLESS_LOOP - // Wait for client I/O events (handle interrupts). while (ACE_OS::poll (poll_array, n_handles) == -1 && errno == EINTR) -- cgit v1.2.1 From ee3e01fbd51a02a2962bdc69b9018a9fdf45dc8c Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 13:22:00 +0100 Subject: Use noexcept(false) directly in the code * TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp: * TAO/tao/Storable_File_Guard.cpp: * TAO/tao/Storable_File_Guard.h: --- TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp | 4 ++-- TAO/tao/Storable_File_Guard.cpp | 2 +- TAO/tao/Storable_File_Guard.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp index 114eae51119..51b466aca48 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp @@ -29,7 +29,7 @@ namespace TAO PG_Group_List_Store_File_Guard (PG_Group_List_Store & list_store, Method_Type method_type); - ~PG_Group_List_Store_File_Guard () ACE_NOEXCEPT_FALSE; + ~PG_Group_List_Store_File_Guard () noexcept(false); virtual void set_object_last_changed (const time_t & time); @@ -69,7 +69,7 @@ TAO::PG_Group_List_Store_File_Guard::PG_Group_List_Store_File_Guard ( } } -TAO::PG_Group_List_Store_File_Guard::~PG_Group_List_Store_File_Guard () ACE_NOEXCEPT_FALSE +TAO::PG_Group_List_Store_File_Guard::~PG_Group_List_Store_File_Guard () noexcept(false) { this->release (); if (list_store_.lock_.release() == -1) diff --git a/TAO/tao/Storable_File_Guard.cpp b/TAO/tao/Storable_File_Guard.cpp index b428fe67121..8f595d7de08 100644 --- a/TAO/tao/Storable_File_Guard.cpp +++ b/TAO/tao/Storable_File_Guard.cpp @@ -24,7 +24,7 @@ Storable_File_Guard (bool redundant, bool use_backup) } TAO::Storable_File_Guard:: -~Storable_File_Guard () ACE_NOEXCEPT_FALSE +~Storable_File_Guard () noexcept(false) { delete fl_; } diff --git a/TAO/tao/Storable_File_Guard.h b/TAO/tao/Storable_File_Guard.h index 3bf33299bc1..7f33ba7c681 100644 --- a/TAO/tao/Storable_File_Guard.h +++ b/TAO/tao/Storable_File_Guard.h @@ -34,7 +34,7 @@ namespace TAO Storable_File_Guard (bool redundant, bool use_backup = Storable_Base::use_backup_default); - virtual ~Storable_File_Guard () ACE_NOEXCEPT_FALSE; + virtual ~Storable_File_Guard () noexcept(false); /// Releases the lock, closes the file, and deletes the I/O stream. /// Destructors of derived classes should call this this will -- cgit v1.2.1 From 3231c97d2264efd325908207d8db620e246c8fce Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 13:47:07 +0100 Subject: Cleanup numeric limits, depend on the standard, part of issue #1377 * ACE/ace/Numeric_Limits.h: * ACE/ace/README: * ACE/ace/config-hpux-11.00.h: --- ACE/ace/Numeric_Limits.h | 168 +++----------------------------------------- ACE/ace/README | 1 - ACE/ace/config-hpux-11.00.h | 3 - 3 files changed, 8 insertions(+), 164 deletions(-) diff --git a/ACE/ace/Numeric_Limits.h b/ACE/ace/Numeric_Limits.h index b842ef71de9..0f888f8ca62 100644 --- a/ACE/ace/Numeric_Limits.h +++ b/ACE/ace/Numeric_Limits.h @@ -27,15 +27,11 @@ #include /**/ "ace/ACE_export.h" -# if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -# endif /* ACE_LACKS_PRAGMA_ONCE */ +#if !defined (ACE_LACKS_PRAGMA_ONCE) +# pragma once +#endif /* ACE_LACKS_PRAGMA_ONCE */ -#ifdef ACE_LACKS_NUMERIC_LIMITS -# include "ace/Basic_Types.h" -#else - -# if defined __MINGW32__ +#if defined __MINGW32__ // Windows defines min/max macros that interfere with the // numeric_limits::min/max() traits. Undefine those macros before // including . @@ -46,12 +42,11 @@ // that would probably break some applications. // // @@ Why isn't this a problem with MSVC++ and Borland builds? -# undef min -# undef max -# endif /* __MINGW32__ */ +# undef min +# undef max +#endif /* __MINGW32__ */ -# include -#endif /* ACE_LACKS_NUMERIC_LIMITS */ +#include // Address global namespace pollution potentially incurred by some // platforms. @@ -60,153 +55,8 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -#ifdef ACE_LACKS_NUMERIC_LIMITS - -template struct ACE_Numeric_Limits; - - -// ------------------------------------------ -// Special cases. -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static char min (void) { return CHAR_MIN; } - static char max (void) { return CHAR_MAX; } -}; - -// ------------------------------------------ -// Signed integers. - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static signed char min (void) { return SCHAR_MIN; } - static signed char max (void) { return SCHAR_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static signed short min (void) { return SHRT_MIN; } - static signed short max (void) { return SHRT_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static signed int min (void) { return INT_MIN; } - static signed int max (void) { return INT_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static signed long min (void) { return LONG_MIN; } - static signed long max (void) { return LONG_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ -#if defined (LLONG_MIN) -# define ACE_LLONG_MIN LLONG_MIN -#elif defined (LONG_LONG_MIN) -# define ACE_LLONG_MIN LONG_LONG_MIN -#elif defined (LONGLONG_MIN) -# define ACE_LLONG_MIN LONGLONG_MIN -#else -# error Unable to determine minimum signed long long value. -#endif /* LLONG_MIN */ - -#if defined (LLONG_MAX) -# define ACE_LLONG_MAX LLONG_MAX -#elif defined (LONG_LONG_MAX) -# define ACE_LLONG_MAX LONG_LONG_MAX -#elif defined (LONGLONG_MAX) -# define ACE_LLONG_MAX LONGLONG_MAX -#else -# error Unable to determine maximum signed long long value. -#endif /* LLONG_MAX */ - - static signed long long min (void) { return ACE_LLONG_MIN; } - static signed long long max (void) { return ACE_LLONG_MAX; } -}; - -// ------------------------------------------ -// Unsigned integers -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static unsigned char min (void) { return 0; } - static unsigned char max (void) { return UCHAR_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static unsigned short min (void) { return 0; } - static unsigned short max (void) { return USHRT_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static unsigned int min (void) { return 0; } - static unsigned int max (void) { return UINT_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static unsigned long min (void) { return 0; } - static unsigned long max (void) { return ULONG_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static unsigned long long min (void) { return 0; } - static unsigned long long max (void) - { -# if defined (ULLONG_MAX) - return ULLONG_MAX; -# elif defined (ULONGLONG_MAX) - return ULONGLONG_MAX; -# else -# error Unable to determine maximum unsigned long long value. -# endif /* ULLONG_MAX */ - } -}; - -// ------------------------------------------ -// Floating point types - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static float min (void) { return FLT_MIN; } - static float max (void) { return FLT_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static double min (void) { return DBL_MIN; } - static double max (void) { return DBL_MAX; } -}; - -template<> -struct ACE_Export ACE_Numeric_Limits -{ - static long double min (void) { return LDBL_MIN; } - static long double max (void) { return LDBL_MAX; } -}; - -#else - // std::numeric_limits<> has all of the necessary specializations. // Just wrap it. - template struct ACE_Numeric_Limits { @@ -214,8 +64,6 @@ struct ACE_Numeric_Limits static T max () { return std::numeric_limits::max (); } }; -#endif /* ACE_LACKS_NUMERIC_LIMITS */ - ACE_END_VERSIONED_NAMESPACE_DECL #include /**/ "ace/post.h" diff --git a/ACE/ace/README b/ACE/ace/README index e975426f438..722ef6682fb 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -886,7 +886,6 @@ ACE_LACKS_NEW_H OS doesn't have, or we don't want to use, new.h. ACE_LACKS_NULL_PTHREAD_STATUS OS requires non-null status pointer for ::pthread_join (). -ACE_LACKS_NUMERIC_LIMITS Platform lacks std::numeric_limits<>. ACE_LACKS_PERFECT_MULTICAST_FILTERING Platform lacks IGMPv3 "perfect" filtering of multicast dgrams at the socket level. If == 1, ACE_SOCK_Dgram_Mcast will bind diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h index 23d754068db..0e46c5df815 100644 --- a/ACE/ace/config-hpux-11.00.h +++ b/ACE/ace/config-hpux-11.00.h @@ -42,9 +42,6 @@ # endif /* RWSTD_NO_NAMESPACE */ # else # define ACE_USES_OLD_IOSTREAMS - // There's no support in ACE's use of numeric_limits for those that - // aren't in std:: -# define ACE_LACKS_NUMERIC_LIMITS # endif /* _HP_NAMESPACE_STD */ # define ACE_HAS_WORKING_EXPLICIT_TEMPLATE_DESTRUCTOR -- cgit v1.2.1 From 7f4644adadd4c6a012214c93b99fd7f277f4c23d Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 14:02:41 +0100 Subject: Cleanup ACE_HAS_STDCPP_STL_INCLUDES * ACE/ace/IOStream.h: * ACE/ace/README: * ACE/ace/config-g++-common.h: * ACE/ace/config-icc-common.h: * ACE/ace/config-linux-common.h: * ACE/ace/config-openvms.h: * ACE/ace/config-suncc-common.h: * ACE/ace/config-sunos5.6.h: * ACE/ace/config-win32-interix.h: --- ACE/ace/IOStream.h | 15 ++++----------- ACE/ace/README | 3 --- ACE/ace/config-g++-common.h | 1 - ACE/ace/config-icc-common.h | 1 - ACE/ace/config-linux-common.h | 1 - ACE/ace/config-openvms.h | 2 -- ACE/ace/config-suncc-common.h | 1 - ACE/ace/config-sunos5.6.h | 3 --- ACE/ace/config-win32-interix.h | 1 - 9 files changed, 4 insertions(+), 24 deletions(-) diff --git a/ACE/ace/IOStream.h b/ACE/ace/IOStream.h index cd22e65e98c..27465c6c02d 100644 --- a/ACE/ace/IOStream.h +++ b/ACE/ace/IOStream.h @@ -42,24 +42,17 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef CString ACE_IOStream_String; ACE_END_VERSIONED_NAMESPACE_DECL # else -# if !defined (ACE_HAS_STDCPP_STL_INCLUDES) -#include /**/ -ACE_BEGIN_VERSIONED_NAMESPACE_DECL -typedef String ACE_IOStream_String; -ACE_END_VERSIONED_NAMESPACE_DECL -# else -# include /**/ +# include /**/ -# if defined(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) +# if defined(ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB) ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef std::string ACE_IOStream_String; ACE_END_VERSIONED_NAMESPACE_DECL -# else +# else ACE_BEGIN_VERSIONED_NAMESPACE_DECL typedef string ACE_IOStream_String; ACE_END_VERSIONED_NAMESPACE_DECL -# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ -# endif /* ! ACE_HAS_STDCPP_STL_INCLUDES */ +# endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ # endif /* ACE_WIN32 && defined (_MSC_VER) */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/ACE/ace/README b/ACE/ace/README index e975426f438..17db6776050 100644 --- a/ACE/ace/README +++ b/ACE/ace/README @@ -553,9 +553,6 @@ ACE_HAS_STHREADS Platform supports Solaris threads ACE_HAS_STANDARD_CPP_LIBRARY Platform/compiler supports Standard C++ Library -ACE_HAS_STDCPP_STL_INCLUDES Standard C++ headers can be - included in the standard way. - e.g. #include ACE_HAS_STRBUF_T Compiler/platform supports struct strbuf ACE_HAS_STRDUP_EMULATION Use ACE's strdup() emulation (even diff --git a/ACE/ace/config-g++-common.h b/ACE/ace/config-g++-common.h index 50daf671852..9592e9340c7 100644 --- a/ACE/ace/config-g++-common.h +++ b/ACE/ace/config-g++-common.h @@ -15,7 +15,6 @@ #define ACE_CC_BETA_VERSION (0) #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 diff --git a/ACE/ace/config-icc-common.h b/ACE/ace/config-icc-common.h index 4fab19823d6..1c6ef3a3653 100644 --- a/ACE/ace/config-icc-common.h +++ b/ACE/ace/config-icc-common.h @@ -4,7 +4,6 @@ #include /**/ "ace/pre.h" # 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 diff --git a/ACE/ace/config-linux-common.h b/ACE/ace/config-linux-common.h index 23e0f579594..a09e5df09c9 100644 --- a/ACE/ace/config-linux-common.h +++ b/ACE/ace/config-linux-common.h @@ -61,7 +61,6 @@ #elif defined (__PGI) // Portable group compiler # define ACE_HAS_CPLUSPLUS_HEADERS -# define ACE_HAS_STDCPP_STL_INCLUDES # define ACE_HAS_STANDARD_CPP_LIBRARY 1 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 # define ACE_LACKS_SWAB diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h index 28d8c01c6f1..f6f8491b5e4 100644 --- a/ACE/ace/config-openvms.h +++ b/ACE/ace/config-openvms.h @@ -50,8 +50,6 @@ #define ACE_MAX_UDP_PACKET_SIZE 65535 -#define ACE_HAS_STDCPP_STL_INCLUDES 1 - /* missing system headers */ #define ACE_LACKS_STDINT_H 1 #define ACE_LACKS_SYS_IPC_H 1 diff --git a/ACE/ace/config-suncc-common.h b/ACE/ace/config-suncc-common.h index ff4d38c4236..1f45779cedb 100644 --- a/ACE/ace/config-suncc-common.h +++ b/ACE/ace/config-suncc-common.h @@ -4,7 +4,6 @@ #include /**/ "ace/pre.h" # 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 diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h index a6e2f0c36a4..115ace0368b 100644 --- a/ACE/ace/config-sunos5.6.h +++ b/ACE/ace/config-sunos5.6.h @@ -49,9 +49,6 @@ #ifndef ACE_HAS_SIG_C_FUNC #define ACE_HAS_SIG_C_FUNC 1 #endif /* ACE_HAS_SIG_C_FUNC */ -#ifndef ACE_HAS_STDCPP_STL_INCLUDES -#define ACE_HAS_STDCPP_STL_INCLUDES 1 -#endif /* ACE_HAS_STDCPP_STL_INCLUDES */ #ifndef ACE_HAS_STRING_CLASS #define ACE_HAS_STRING_CLASS 1 #endif /* ACE_HAS_STRING_CLASS */ diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h index e3d54cb54e8..0fa6ee1febc 100644 --- a/ACE/ace/config-win32-interix.h +++ b/ACE/ace/config-win32-interix.h @@ -50,7 +50,6 @@ #define ACE_HAS_SOCKLEN_T #define ACE_HAS_SSIZE_T #define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STDCPP_STL_INCLUDES #define ACE_HAS_STREAMS #define ACE_HAS_STRING_CLASS #define ACE_HAS_STRSIGNAL -- cgit v1.2.1 From 7a0b435aa1049ecc912f2a4b4954b91873452dc4 Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Tue, 5 Jan 2021 14:03:27 +0100 Subject: More cleanup * ACE/ace/config-sunos5.6.h: * ACE/ace/config-win32-borland.h: * ACE/ace/config-win32-dmc.h: --- ACE/ace/config-sunos5.6.h | 3 --- ACE/ace/config-win32-borland.h | 1 - ACE/ace/config-win32-dmc.h | 1 - 3 files changed, 5 deletions(-) diff --git a/ACE/ace/config-sunos5.6.h b/ACE/ace/config-sunos5.6.h index 115ace0368b..34684cb34ae 100644 --- a/ACE/ace/config-sunos5.6.h +++ b/ACE/ace/config-sunos5.6.h @@ -55,9 +55,6 @@ #ifndef ACE_HAS_STANDARD_CPP_LIBRARY #define ACE_HAS_STANDARD_CPP_LIBRARY 1 #endif /* ACE_HAS_STANDARD_CPP_LIBRARY */ -#ifndef ACE_HAS_STDCPP_STL_INCLUDES -#define ACE_HAS_STDCPP_STL_INCLUDES 1 -#endif /* ACE_HAS_STDCPP_STL_INCLUDES */ #ifndef ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB #define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1 #endif /* ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB */ diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h index 88b54d708cd..cfbaaf67216 100644 --- a/ACE/ace/config-win32-borland.h +++ b/ACE/ace/config-win32-borland.h @@ -119,7 +119,6 @@ #define ACE_HAS_NONCONST_SELECT_TIMEVAL #define ACE_HAS_SIG_ATOMIC_T #define ACE_HAS_STANDARD_CPP_LIBRARY 1 -#define ACE_HAS_STDCPP_STL_INCLUDES 1 #define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_ACE_IOSTREAM 1 diff --git a/ACE/ace/config-win32-dmc.h b/ACE/ace/config-win32-dmc.h index 1a31077a51e..398f3ed503e 100644 --- a/ACE/ace/config-win32-dmc.h +++ b/ACE/ace/config-win32-dmc.h @@ -46,7 +46,6 @@ #define ACE_HAS_NONCONST_SELECT_TIMEVAL 1 #define ACE_HAS_SIG_ATOMIC_T 1 #define ACE_HAS_STANDARD_CPP_LIBRARY 0 -#define ACE_HAS_STDCPP_STL_INCLUDES 1 #define ACE_HAS_STRING_CLASS 1 #define ACE_HAS_USER_MODE_MASKS 1 #define ACE_LACKS_STRPTIME 1 -- cgit v1.2.1