diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2018-02-17 22:32:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-17 22:32:19 +0100 |
| commit | b3a525bcc9a7e575b8e17e0abb9dd7d8f39cb5a7 (patch) | |
| tree | 52a694821e966d08d9baa80058c8d063405a1422 | |
| parent | cb29bd46571e428d1d71c860ec9010d29a3a1fe4 (diff) | |
| parent | e46f45e6a00228722f3694152fcb02e79a9c1bc9 (diff) | |
| download | ATCD-b3a525bcc9a7e575b8e17e0abb9dd7d8f39cb5a7.tar.gz | |
Merge pull request #574 from jwillemsen/jwi-taoidlleak
msvc7.1 and gcc 4.1.1 can't handle this test so disable this test for…
| -rw-r--r-- | ACE/tests/Compiler_Features_38_Test.cpp | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp index aae2d5a330e..83733394013 100644 --- a/ACE/tests/Compiler_Features_38_Test.cpp +++ b/ACE/tests/Compiler_Features_38_Test.cpp @@ -5,6 +5,17 @@ #include "test_config.h" +// g++ 4.1 can't handle this construct +#if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 1)) +# define ACE_DISABLE_TEST +#endif + +// Visual Studio 7.1 can't handle this construct +#if (_MSC_VER == 1310) +# define ACE_DISABLE_TEST +#endif + +#if !defined (ACE_DISABLE_TEST) template <typename T> class Foo_T { @@ -22,15 +33,18 @@ struct Foo2 long i; }; typedef Foo_T<Foo2> Foo2Seq; +#endif /* !ACE_DISABLE_TEST */ int run_main (int, ACE_TCHAR *[]) { ACE_START_TEST (ACE_TEXT("Compiler_Features_38_Test")); +#if !defined (ACE_DISABLE_TEST) Foo2Seq f2; long const j = f2[0].i; ACE_UNUSED_ARG(j); +#endif /* !ACE_DISABLE_TEST */ ACE_DEBUG ((LM_INFO, ACE_TEXT ("C++ support ok\n"))); |