diff options
| author | Adam Mitz <mitza@ociweb.com> | 2018-01-11 13:54:08 -0600 |
|---|---|---|
| committer | Adam Mitz <mitza@ociweb.com> | 2018-01-11 13:54:08 -0600 |
| commit | e5d6c55227f9ee795d2e8ff8473296848a7e0190 (patch) | |
| tree | a30d6be749a7f798f97095f9a155b9b2801028ba /ACE/tests/Compiler_Features_32_Test.cpp | |
| parent | 90adcc25acb454ce3de98443fb76e9a6d52de871 (diff) | |
| download | ATCD-e5d6c55227f9ee795d2e8ff8473296848a7e0190.tar.gz | |
check clang version number for compiler test workaround
Diffstat (limited to 'ACE/tests/Compiler_Features_32_Test.cpp')
| -rw-r--r-- | ACE/tests/Compiler_Features_32_Test.cpp | 4 |
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 92b668cb1d8..cdfbe7bc643 100644 --- a/ACE/tests/Compiler_Features_32_Test.cpp +++ b/ACE/tests/Compiler_Features_32_Test.cpp @@ -41,7 +41,7 @@ A::u_type_::~u_type_ () void A::clear () { -#ifdef __clang__ +#if defined __clang__ && __clang_major__ <= 5 // As of 5.0, clang requires one of two workarounds: // 1. the name after ~ must be in scope using std::string; @@ -54,7 +54,7 @@ struct B { std::string m; } u_; void clear() { -#ifdef __clang__ +#if defined __clang__ && __clang_major__ <= 5 // 2. actual class name instead of typedef u_.m.std::string::~basic_string (); #else |