diff options
author | Erik Sohns <esohns@users.noreply.github.com> | 2023-01-22 17:38:34 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-22 17:38:34 +0100 |
commit | 9e18d338ec598e1a8da6d32a0fba5a20c76978f7 (patch) | |
tree | 045f42001bd4e15cf8285686798fe47acd2f2b60 /ACE/ace/String_Base_Const.cpp | |
parent | 8b6ad82dc91f728cea2c9e86a17e5969a3338fcc (diff) | |
parent | 8ab31e3e5bb8c09a9c326a54545f4cb475345a78 (diff) | |
download | ATCD-9e18d338ec598e1a8da6d32a0fba5a20c76978f7.tar.gz |
Merge branch 'master' into message_queue_ex_get_queue
Diffstat (limited to 'ACE/ace/String_Base_Const.cpp')
-rw-r--r-- | ACE/ace/String_Base_Const.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/ACE/ace/String_Base_Const.cpp b/ACE/ace/String_Base_Const.cpp index 12169d66a39..b16349b7edf 100644 --- a/ACE/ace/String_Base_Const.cpp +++ b/ACE/ace/String_Base_Const.cpp @@ -4,15 +4,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_String_Base_Const::size_type const ACE_String_Base_Const::npos = -#if defined (AIX) //&& (defined (__xlC__) || defined (__IBMCPP__)) - // Under some mixed shared/static linking conditions, this constant - // will not be initialized at run-time if the - // std::numeric_limits<>::max() trait is used on AIX/XLC++. - // Workaround that problem by making it easier for the compiler to - // realize it can set the constant at compile-time. - static_cast<ACE_String_Base_Const::size_type> (-1); -#else ACE_Numeric_Limits<ACE_String_Base_Const::size_type>::max (); -#endif /* AIX */ ACE_END_VERSIONED_NAMESPACE_DECL |