summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mitz <mitza@objectcomputing.com>2018-09-26 15:44:56 -0500
committerGitHub <noreply@github.com>2018-09-26 15:44:56 -0500
commitbb7db0d427c7bc7255710d0335c1afa91c135837 (patch)
tree45c190ef3d9d95f0fe70e01e5eefdd6da37cc415
parent8ae53fb64d31fa1b3f6136933bec8af870f6fe57 (diff)
parent1b27e1d8bb7c9246b7f7ffd53532fb1d1123e896 (diff)
downloadATCD-bb7db0d427c7bc7255710d0335c1afa91c135837.tar.gz
Merge pull request #719 from mitza-oci/master
clang 7
-rw-r--r--ACE/tests/Compiler_Features_32_Test.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp
index 4b1354cd0b4..4a3790bebc7 100644
--- a/ACE/tests/Compiler_Features_32_Test.cpp
+++ b/ACE/tests/Compiler_Features_32_Test.cpp
@@ -43,12 +43,12 @@ void A::clear ()
{
#if defined __clang__ && \
(defined __apple_build_version__ && __apple_build_version__ < 9100000 \
- || __clang_major__ <= 6)
+ || __clang_major__ <= 7)
#define CLANG_WORKAROUND
#endif
#ifdef CLANG_WORKAROUND
- // As of 5.0, clang requires one of two workarounds:
+ // clang requires one of two workarounds:
// 1. the name after ~ must be in scope
using std::string;
#endif