diff options
| author | Adam Mitz <mitza@objectcomputing.com> | 2021-11-04 17:22:01 -0500 |
|---|---|---|
| committer | Adam Mitz <mitza@objectcomputing.com> | 2021-11-04 17:22:01 -0500 |
| commit | 920ee20982e751376e99e782515831acf0cebefd (patch) | |
| tree | 2e105f44f31bda0cf4509e469a85253336bfe502 | |
| parent | 7e1eda8c1cd59d4d1720ceb96b24a8806de33877 (diff) | |
| download | ATCD-920ee20982e751376e99e782515831acf0cebefd.tar.gz | |
Updated ACE tests for /std:c++17
| -rw-r--r-- | ACE/tests/Compiler_Features_09_Test.cpp | 2 | ||||
| -rw-r--r-- | ACE/tests/Compiler_Features_10_Test.cpp | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ACE/tests/Compiler_Features_09_Test.cpp b/ACE/tests/Compiler_Features_09_Test.cpp index eb38413cd6e..3918f865983 100644 --- a/ACE/tests/Compiler_Features_09_Test.cpp +++ b/ACE/tests/Compiler_Features_09_Test.cpp @@ -62,6 +62,7 @@ run_main (int, ACE_TCHAR *[]) // failure int status = 0; +#ifndef ACE_HAS_CPP17 // There is no auto_ptr in C++17 // ... this works with the ACE version of auto_ptr (well, the // namespace is broken, but you get the idea) ... std::auto_ptr<Base> x(new Base); @@ -102,6 +103,7 @@ run_main (int, ACE_TCHAR *[]) )); } +#endif ACE_END_TEST; return status; } diff --git a/ACE/tests/Compiler_Features_10_Test.cpp b/ACE/tests/Compiler_Features_10_Test.cpp index 6882b316315..d4ca21624e0 100644 --- a/ACE/tests/Compiler_Features_10_Test.cpp +++ b/ACE/tests/Compiler_Features_10_Test.cpp @@ -184,7 +184,11 @@ run_main (int, ACE_TCHAR *[]) { // ... start the test fresh ... reset_counts(); +#ifdef ACE_HAS_CPP17 + const auto b = std::make_unique<Aggregate>(); +#else std::auto_ptr<Aggregate> b(new Aggregate); +#endif never_reached(__FILE__, __LINE__); } catch(...) |