ChangeLogTag:

4 files changed, 36 insertions, 23 deletions

diff --git a/ChangeLog b/ChangeLog
index 809bc897ca1..e9328733726 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Jun 13 06:02:32 2003  Balachandran Natarajan  <bala@cs.wustl.edu>
+
+	* ace/Template_Instantiations.cpp: Removed the explicit template
+	  instantiations introduced by this change "Thu Jun 12 15:20:37
+	  2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>". This
+	  botches up SunOS53 build.
+
+	* ace/Containers_Instantiations.cpp: A new file where we have
+	  moved the instantiations.
+
+	  Thanks t Chris Cleeland for alerting us on this.
+
 Thu Jun 12 15:20:37 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* ace/Template_Instantiations.cpp: This file now contains some
diff --git a/ace/Container_Instantiations.cpp b/ace/Container_Instantiations.cpp
new file mode 100644
index 00000000000..9b45dacf6e4
--- /dev/null
+++ b/ace/Container_Instantiations.cpp
@@ -0,0 +1,19 @@
+// $Id$
+#include "ace/CDR_Base.h"
+#include "ace/Unbounded_Queue.h"
+
+// Instantiations of templates with basic data types that can be used
+// across  ACE+TAO.
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
+
+template class ACE_Node<ACE_INT32>;
+template class ACE_Unbounded_Queue<ACE_INT32>;
+template class ACE_Unbounded_Queue_Iterator<ACE_INT32>;
+
+#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
+
+#pragma instantiate ACE_Node<ACE_INT32>;
+#pragma instantiate ACE_Unbounded_Queue<ACE_INT32>;
+#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_INT32>;
+
+#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
diff --git a/ace/Makefile.ace b/ace/Makefile.ace
index de6de582a3e..8d773009315 100644
--- a/ace/Makefile.ace
+++ b/ace/Makefile.ace
@@ -59,7 +59,7 @@ UTILS_FILES = \
   String_Base_Const \
   SString \
   Stats \
-  Template_Instantiations \
+  Container_Instantiations \
   Sample_History
   #### NOTE:  see below for Filecache.
 LOGGING_FILES = \
@@ -324,6 +324,7 @@ TEMPLATE_FILES = \
            Timer_Heap_T \
            Timer_List_T \
            Timer_Queue_Adapters \
+  	   Template_Instantiations \
            Timer_Queue_T \
            Timer_Wheel_T \
            Typed_SV_Message \
diff --git a/ace/Template_Instantiations.cpp b/ace/Template_Instantiations.cpp
index 645917aca35..9865307899d 100644
--- a/ace/Template_Instantiations.cpp
+++ b/ace/Template_Instantiations.cpp
@@ -1,25 +1,5 @@
-// $Id$
-#include "ace/CDR_Base.h"
-#include "ace/Unbounded_Queue.h"
-
-// Instantiations of templates with basic data types that can be used
-// across  ACE+TAO.
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
-
-template class ACE_Node<ACE_INT32>;
-template class ACE_Unbounded_Queue<ACE_INT32>;
-template class ACE_Unbounded_Queue_Iterator<ACE_INT32>;
-
-#elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA)
-
-#pragma instantiate ACE_Node<ACE_INT32>;
-#pragma instantiate ACE_Unbounded_Queue<ACE_INT32>;
-#pragma instantiate ACE_Unbounded_Queue_Iterator<ACE_INT32>;
-
-#endif /*ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION*/
-
-#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE)
-// Note: this part has been created through concatenation of ALL
+//$Id$
+// Note: this file has been created through concatenation of ALL
 // explicit template instantiations in ACE, and only those that
 // interfered with the multithreaded port of ACE to pSOS using the
 // Diab D-C++ 4.1a compiler have been wrapped with the appropriate
@@ -29,6 +9,7 @@ template class ACE_Unbounded_Queue_Iterator<ACE_INT32>;
 // wish to extend this technique to instantiation pragmas, you will
 // need to modify the preprocesor directives below
 
+#if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_FILE)
 // header files that are not already included
 #include "ace/Local_Tokens.h"
 #include "ace/Token.h"