ChangeLogTag:Thu Jun 12 15:20:37 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu>

5 files changed, 40 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index a602ad0bb66..f77ded0bffa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Thu Jun 12 15:20:37 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
+
+	* ace/Template_Instantiations.cpp: This file now contains some
+	  useful template definitions that would be used by ACE+TAO and
+	  its applications. We have started of by doing
+	  ACE_Unbounded_Queue<long>. In future we will add other basic 
+	  types on a case by case basis.
+
+	* ace/Stats.cpp: Removed the template instantiations of
+	  ACE_Unbounded_Queue<long> since it has now been moved to another
+	  file. 
+
+	* ace/Makefile.ace: Compile the file Template_Instantiations.cpp
+	  in normal builds.
+
 Wed Jun 11 16:27:41 2003  Steve Huston  <shuston@riverace.com>
 
 	* examples/C++NPv1/Logging_Client.cpp:
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp
index a95818359d7..d29cb18bb75 100644
--- a/ace/INET_Addr.cpp
+++ b/ace/INET_Addr.cpp
@@ -325,7 +325,7 @@ static int get_port_number_from_name (const char port_name[],
   // We try to resolve port number from its name.
 
 #if defined (VXWORKS) || defined (CHORUS) || defined (ACE_LACKS_GETSERVBYNAME)
-  port_number = -1;
+  port_number = 0;
   ACE_UNUSED_ARG (port_name);
   ACE_UNUSED_ARG (protocol);
 #else
diff --git a/ace/Makefile.ace b/ace/Makefile.ace
index 98cbd309256..de6de582a3e 100644
--- a/ace/Makefile.ace
+++ b/ace/Makefile.ace
@@ -59,6 +59,7 @@ UTILS_FILES = \
   String_Base_Const \
   SString \
   Stats \
+  Template_Instantiations \
   Sample_History
   #### NOTE:  see below for Filecache.
 LOGGING_FILES = \
@@ -317,7 +318,6 @@ TEMPLATE_FILES = \
            Svc_Handler \
            Synch_T \
            Task_T \
-           Template_Instantiations \
 	   Test_and_Set \
            Timeprobe_T \
            Timer_Hash_T \
diff --git a/ace/Stats.cpp b/ace/Stats.cpp
index f9d60fbcd78..0ca18fafcb8 100644
--- a/ace/Stats.cpp
+++ b/ace/Stats.cpp
@@ -591,7 +591,7 @@ ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg,
     ACE_static_cast (double,
                      ACE_UINT64_DBLCAST_ADAPTER(elapsed_time / sf));
 #endif /* ! ACE_LACKS_LONGLONG_T */
-  seconds /= ACE_HR_SCALE_CONVERSION; 
+  seconds /= ACE_HR_SCALE_CONVERSION;
   double t_avg = samples_count / seconds;
 
   ACE_DEBUG ((LM_DEBUG,
@@ -602,11 +602,7 @@ ACE_Throughput_Stats::dump_throughput (const ACE_TCHAR *msg,
 // ****************************************************************
 
 #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/Template_Instantiations.cpp b/ace/Template_Instantiations.cpp
index 28f6aa318e7..645917aca35 100644
--- a/ace/Template_Instantiations.cpp
+++ b/ace/Template_Instantiations.cpp
@@ -1,6 +1,25 @@
 // $Id$
+#include "ace/CDR_Base.h"
+#include "ace/Unbounded_Queue.h"
 
-// Note: this file has been created through concatenation of ALL
+// 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
 // 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
@@ -10,8 +29,6 @@
 // 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"