ChangeLogTag:Mon Apr 7 17:04:20 2003 Steve Huston <shuston@riverace.com>

4 files changed, 54 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 6a86de4bff4..c4185dd9961 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Mon Apr  7 17:04:20 2003  Steve Huston  <shuston@riverace.com>
+
+	* tests/Unbounded_Set_Test_Ex.cpp: Moved the definition of MyNode
+	  to its own file, Unbounded_Set_Test_Ex.h to allow the
+	  ever-cooperative AIX Visual Age C++ compiler to find the definition
+	  when instantiating templates. Also changed the name of the
+	  recorded log file to match the test name so the autobuild
+	  log analysis can find it.
+
+	* tests/run_test.lst: Added Unbounded_Set_Test_Ex.
+
 Mon Apr  7 12:27:25 2003  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/MakeProjectCreator/modules/TemplateParser.pm:
diff --git a/tests/Unbounded_Set_Test_Ex.cpp b/tests/Unbounded_Set_Test_Ex.cpp
index a1c7188fbfa..5d79a7bb883 100644
--- a/tests/Unbounded_Set_Test_Ex.cpp
+++ b/tests/Unbounded_Set_Test_Ex.cpp
@@ -22,21 +22,13 @@
 // ============================================================================
 
 #include "test_config.h"
-#include <ace/Unbounded_Set_Ex.h>
-#include <ace/Auto_Ptr.h>
-#include <ace/SString.h>
+#include "Unbounded_Set_Test_Ex.h"
+#include "ace/Unbounded_Set_Ex.h"
+#include "ace/Auto_Ptr.h"
+#include "ace/SString.h"
 
 ACE_RCSID(tests, Unbounded_Set_Test_Ex, "$Id$")
 
-struct MyNode
-{
-  unsigned k;
-  MyNode () : k (0) {}
-  MyNode (int pk) : k (pk) {}
-  MyNode (const MyNode& o) : k (o.k) {}
-  bool operator== (const MyNode& o) { return (k == o.k); }
-};
-
 size_t count_const_set (const ACE_Unbounded_Set_Ex<MyNode>& cubs)
 {
   size_t number_of_elements = 0;
@@ -52,7 +44,7 @@ ACE_TMAIN (int, ACE_TCHAR *[])
   unsigned k;
   MyNode node (1);
 
-  ACE_START_TEST (ACE_TEXT ("Unbounded_Set_Test"));
+  ACE_START_TEST (ACE_TEXT ("Unbounded_Set_Test_Ex"));
 
   ACE_Unbounded_Set_Ex<MyNode> ubs;
   ACE_ASSERT (ubs.size () == 0);
diff --git a/tests/Unbounded_Set_Test_Ex.h b/tests/Unbounded_Set_Test_Ex.h
new file mode 100644
index 00000000000..1987bd7feaa
--- /dev/null
+++ b/tests/Unbounded_Set_Test_Ex.h
@@ -0,0 +1,37 @@
+// $Id$
+
+// ============================================================================
+//
+// = LIBRARY
+//    tests
+//
+// = FILENAME
+//    Unbounded_Set_Test_Ex.h
+//
+// = DESCRIPTION
+//    This class gets its own header file to work around AIX C++
+//    compiler "features" related to template instantiation...  It is
+//    only used by Unbounded_Set_Test_Ex.cpp.
+//
+// = AUTHOR
+//      Oliver Kellogg <Oliver.Kellogg@sysde.eads.net>
+//
+// ============================================================================
+
+#ifndef ACE_TESTS_UNBOUNDED_SET_TEST_EX_H
+#define ACE_TESTS_UNBOUNDED_SET_TEST_EX_H
+
+#if !defined (ACE_LACKS_PRAGMA_ONCE)
+# pragma once
+#endif /* ACE_LACKS_PRAGMA_ONCE */
+
+struct MyNode
+{
+  unsigned k;
+  MyNode () : k (0) {}
+  MyNode (int pk) : k (pk) {}
+  MyNode (const MyNode& o) : k (o.k) {}
+  bool operator== (const MyNode& o) { return (k == o.k); }
+};
+
+#endif /* ACE_TESTS_UNBOUNDED_SET_TEST_EX_H */
diff --git a/tests/run_test.lst b/tests/run_test.lst
index e241a498b1c..20a81cb1f3a 100644
--- a/tests/run_test.lst
+++ b/tests/run_test.lst
@@ -128,5 +128,6 @@ Tokens_Test: ALL MSVC !DISABLED TOKEN !chorus !Unicos
 TP_Reactor_Test: ALL
 TSS_Test
 Vector_Test
+Unbounded_Set_Test_Ex
 UPIPE_SAP_Test: !VxWorks
 Upgradable_RW_Test: !chorus