From e46f45e6a00228722f3694152fcb02e79a9c1bc9 Mon Sep 17 00:00:00 2001
From: Johnny Willemsen <jwillemsen@remedy.nl>
Date: Sat, 17 Feb 2018 20:05:27 +0100
Subject: msvc7.1 and gcc 4.1.1 can't handle this test so disable this test for
 those compilers

---
 ACE/tests/Compiler_Features_38_Test.cpp | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

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")));
-- 
cgit v1.2.1