ChangeLogTag: Wed Apr 09 19:13:12 2002 Johnny Willemsen <jwillemsen@remedy.nl>

21 files changed, 63 insertions, 52 deletions

diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp
index 84adb46e89f..60f9b434550 100644
--- a/TAO/tao/Connection_Handler.cpp
+++ b/TAO/tao/Connection_Handler.cpp
@@ -94,7 +94,7 @@ TAO_Connection_Handler::svc_i (void)
 
   if (TAO_debug_level > 0)
     ACE_DEBUG ((LM_DEBUG,
-                ACE_TEXT ("TAO (%P|%t) TAO_Connection_Handler::svc_i begin\n")));
+                ACE_TEXT ("TAO (%P|%t) - TAO_Connection_Handler::svc_i begin\n")));
 
   // Here we simply synthesize the "typical" event loop one might find
   // in a reactive handler, except that this can simply block waiting
@@ -342,7 +342,7 @@ TAO_Connection_Handler::handle_input_eh (
     {
       ACE_HANDLE handle = eh->get_handle ();
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) Connection_Handler[%d]::handle_input, "
+                  "TAO (%P|%t) - Connection_Handler[%d]::handle_input, "
                   "handle = %d/%d, refcount = %d, retval = %d\n",
                   t_id, handle, h, refcount, return_value));
     }
diff --git a/TAO/tao/IIOP_Acceptor.cpp b/TAO/tao/IIOP_Acceptor.cpp
index 64665e89673..3ebf8db8842 100644
--- a/TAO/tao/IIOP_Acceptor.cpp
+++ b/TAO/tao/IIOP_Acceptor.cpp
@@ -278,8 +278,8 @@ TAO_IIOP_Acceptor::open (TAO_ORB_Core *orb_core,
       // The hostname cache has already been set!
       // This is bad mojo, i.e. an internal TAO error.
       ACE_ERROR_RETURN ((LM_ERROR,
-                         ACE_TEXT ("TAO (%P|%t) ")
-                         ACE_TEXT ("IIOP_Acceptor::open - "),
+                         ACE_TEXT ("TAO (%P|%t) - ")
+                         ACE_TEXT ("IIOP_Acceptor::open, "),
                          ACE_TEXT ("hostname already set\n\n")),
                         -1);
     }
diff --git a/TAO/tao/IIOP_Connection_Handler.cpp b/TAO/tao/IIOP_Connection_Handler.cpp
index 80a94ac6dd4..c0d86311759 100644
--- a/TAO/tao/IIOP_Connection_Handler.cpp
+++ b/TAO/tao/IIOP_Connection_Handler.cpp
@@ -136,8 +136,8 @@ TAO_IIOP_Connection_Handler::open (void*)
         return -1;
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_LIB_TEXT ("TAO (%P|%t) IIOP connection to peer ")
-                  ACE_LIB_TEXT ("<%s> on %d\n"),
+                  ACE_LIB_TEXT ("TAO (%P|%t) - Connection_Handler::open, IIOP ")
+                  ACE_LIB_TEXT ("connection to peer <%s> on %d\n"),
                   client, this->peer ().get_handle ()));
     }
 
@@ -164,8 +164,8 @@ TAO_IIOP_Connection_Handler::activate (long flags,
 {
   if (TAO_debug_level)
     ACE_DEBUG  ((LM_DEBUG,
-                 ACE_LIB_TEXT ("TAO (%P|%t) IIOP_Connection_Handler::activate %d ")
-                 ACE_LIB_TEXT ("threads, flags = %d\n"),
+                 ACE_LIB_TEXT ("TAO (%P|%t) - IIOP_Connection_Handler::")
+                 ACE_LIB_TEXT ("activate %d threads, flags = %d\n"),
                  n_threads,
                  flags,
                  THR_BOUND));
diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp
index c392e3808ba..95a3d7b4c6a 100644
--- a/TAO/tao/IIOP_Transport.cpp
+++ b/TAO/tao/IIOP_Transport.cpp
@@ -111,8 +111,8 @@ TAO_IIOP_Transport::recv_i (char *buf,
     {
 
       ACE_DEBUG ((LM_DEBUG,
-                  ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv_i, "),
-                  ACE_TEXT ("read failure - %m"),
+                  ACE_TEXT ("TAO (%P|%t) - IIOP_Transport[%d]::recv_i, ")
+                  ACE_TEXT ("read failure - %m\n"),
                   this->id ()));
     }
 
@@ -388,7 +388,7 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails)
                                       *acceptor) == -1)
             {
               ACE_ERROR ((LM_ERROR,
-                          "TAO (%P|%t) - IIOP_Transport::set_bidir_info, ",
+                          "TAO (%P|%t) - IIOP_Transport::set_bidir_info, "
                           "error getting listen_point \n"));
 
               return;
@@ -448,7 +448,7 @@ TAO_IIOP_Transport::get_listen_point (
       {
         ACE_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT ("(%P|%t) Could not resolve local ")
-                         ACE_TEXT ("host address in ")
+                           ACE_TEXT ("host address in ")
                            ACE_TEXT ("get_listen_point()\n")),
                           -1);
       }
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 882aebaa6af..54bd5f0b0da 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -681,7 +681,7 @@ TAO_GIOP_Synch_Invocation::invoke_i (CORBA::Boolean is_locate_request
       CORBA::ULong msecs = this->max_wait_time_->msec ();
 
       ACE_DEBUG ((LM_DEBUG,
-                  "TAO (%P|%t) Synch_Invocation::invoke_i, "
+                  "TAO (%P|%t) - Synch_Invocation::invoke_i, "
                   "timeout after recv is <%u> status <%d>\n",
                   msecs,
                   reply_error));
diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
index fb3e2342e88..d3881e46707 100644
--- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
+++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp
@@ -78,7 +78,7 @@ TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
           CORBA::ULong msecs =
             ACE_static_cast (CORBA::ULong, microseconds / 1000);
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
+                      ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"),
                       msecs));
         }
     }
diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp
index a82e0706a7d..cb44c2c2a6c 100644
--- a/TAO/tao/Messaging/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp
@@ -81,7 +81,7 @@ TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core,
       if (TAO_debug_level > 0)
         {
           ACE_DEBUG ((LM_DEBUG,
-                      ACE_TEXT ("TAO (%P|%t) Timeout is <%u>\n"),
+                      ACE_TEXT ("TAO (%P|%t) - Timeout is <%u>\n"),
                       time_value.msec ()));
         }
     }
diff --git a/TAO/tao/ORBInitializer_Registry.cpp b/TAO/tao/ORBInitializer_Registry.cpp
index cb2229d494f..6e3ef414f3d 100644
--- a/TAO/tao/ORBInitializer_Registry.cpp
+++ b/TAO/tao/ORBInitializer_Registry.cpp
@@ -121,4 +121,7 @@ template class ACE_Array_Base<PortableInterceptor::ORBInitializer_var>;
 #pragma instantiate TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>
 #pragma instantiate ACE_Array_Base<PortableInterceptor::ORBInitializer_var>
 
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS))
+template TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ORBInitializer_Registry, TAO_SYNCH_MUTEX>::singleton_;
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp
index 70aac86538f..cfa544dcc1a 100644
--- a/TAO/tao/ORB_Core.cpp
+++ b/TAO/tao/ORB_Core.cpp
@@ -2949,4 +2949,7 @@ template class ACE_Dynamic_Service<TAO_Client_Strategy_Factory>;
 #pragma instantiate ACE_Dynamic_Service<TAO_Server_Strategy_Factory>
 #pragma instantiate ACE_Dynamic_Service<TAO_Client_Strategy_Factory>
 
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS))
+template TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX> * TAO_TSS_Singleton<TAO_TSS_Resources, TAO_SYNCH_MUTEX>::singleton_;
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/ORB_Table.cpp b/TAO/tao/ORB_Table.cpp
index 12ac9358b70..4edbb624fd5 100644
--- a/TAO/tao/ORB_Table.cpp
+++ b/TAO/tao/ORB_Table.cpp
@@ -153,4 +153,8 @@ template class ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_ORB_Core *, AC
 #pragma instantiate ACE_Hash_Map_Iterator_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
 #pragma instantiate ACE_Hash_Map_Reverse_Iterator_Ex<const char *, TAO_ORB_Core *, ACE_Hash<const char *>, ACE_Equal_To<const char *>, ACE_Null_Mutex>
 
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS))
+
+template TAO_Singleton<TAO_ORB_Table,TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ORB_Table,TAO_SYNCH_MUTEX>::singleton_;
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */
diff --git a/TAO/tao/RTCORBA/RT_Mutex.h b/TAO/tao/RTCORBA/RT_Mutex.h
index bc5e5cb1ab9..d15d37748db 100644
--- a/TAO/tao/RTCORBA/RT_Mutex.h
+++ b/TAO/tao/RTCORBA/RT_Mutex.h
@@ -64,7 +64,7 @@ public:
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   /**
-   * Acquire the lock, but only wait up to <max_wait> time.  Note
+   * Acquire the lock, but only wait up to @a max_wait time.  Note
    * that this operation may not be available on all OS platforms, so
    * if you're interested in writing maximally portable programs avoid
    * using this operation in your program designs.
@@ -88,7 +88,6 @@ protected:
  * @brief Extension to TAO_RT_Mutex to support named mutexes.
  *
  */
-
 class TAO_RTCORBA_Export TAO_Named_RT_Mutex : public TAO_RT_Mutex
 {
 public:
diff --git a/TAO/tao/RTCORBA/RT_ORBInitializer.h b/TAO/tao/RTCORBA/RT_ORBInitializer.h
index 395aa0d70e6..ae59bccdbdf 100644
--- a/TAO/tao/RTCORBA/RT_ORBInitializer.h
+++ b/TAO/tao/RTCORBA/RT_ORBInitializer.h
@@ -42,7 +42,7 @@ class TAO_RTCORBA_Export TAO_RT_ORBInitializer :
   public virtual TAO_Local_RefCounted_Object
 {
 public:
-  // Priority mapping types
+  /// Priority mapping types
   enum
   {
     TAO_PRIORITY_MAPPING_CONTINUOUS,
@@ -90,7 +90,7 @@ private:
 
   /** Scheduling policy.  This value is passed to ACE_OS::thr_setprio().
     * For POSIX pthreads, it maps directly to the pthread_setschedparam() policy
-    * parameter.  Legal values are ACE_SCHED_RR, ACE_SCHED_FIFO, 
+    * parameter.  Legal values are ACE_SCHED_RR, ACE_SCHED_FIFO,
     * ACE_SCHED_OTHER, ACE_SCHED_*, etc.
     */
   long sched_policy_;
diff --git a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
index 095b4da8023..32fedf30e00 100644
--- a/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
+++ b/TAO/tao/RTCORBA/RT_Protocols_Hooks.h
@@ -29,11 +29,10 @@
 class TAO_RTCORBA_Export TAO_RT_Protocols_Hooks : public TAO_Protocols_Hooks
 {
 public:
-
-  /// constructor
+  /// Constructor
   TAO_RT_Protocols_Hooks (void);
 
-  /// destructor
+  /// Destructor
   virtual ~TAO_RT_Protocols_Hooks (void);
 
   /// Initialize the protocols hooks instance.
@@ -45,15 +44,14 @@ public:
    * The timeout hook is used to determine if the client_protocols policy is
    * set and with what value.  If the ORB is compiled without support
    * for RTCORBA this feature does not take effect
-   * \param tcp_properties returns the Protocol List set
+   * @param tcp_properties returns the Protocol List set
    */
-
   virtual int call_client_protocols_hook (int &send_buffer_size,
 					  int &recv_buffer_size,
 					  int &no_delay,
 					  int &enable_network_priority,
 					  const char *protocol_type);
-  
+
   /// Define the Client_Protocols_TCP_Hook signature
   typedef int (*Client_Protocols_Hook) (TAO_ORB_Core *,
                                         int &send_buffer_size,
@@ -72,7 +70,7 @@ public:
    * The timeout hook is used to determine if the client_protocols policy is
    * set and with what value.  If the ORB is compiled without support
    * for RTCORBA this feature does not take effect
-   * \param tcp_properties returns the Protocol List set
+   * @param tcp_properties returns the Protocol List set
    */
   virtual int call_server_protocols_hook (int &send_buffer_size,
                                           int &recv_buffer_size,
@@ -101,7 +99,7 @@ public:
 							int &no_delay,
 							int &enable_network_priority,
 							const char *protocol_type);
-  
+
   virtual int get_effective_server_protocol_properties (TAO_Adpater *poa,
 							int &send_buffer_size,
 							int &recv_buffer_size,
@@ -114,24 +112,24 @@ public:
   virtual int update_client_protocol_properties (TAO_Stub *stub,
 							TAO_Connection_Handler * connection_handler,
 							const char *protocol_type);
-  
+
 
   virtual int update_server_protocol_properties (CORBA::Policy *server_policy,
 							TAO_Connection_Handler * connection_handler,
 							const char *protocol_type);
 
   virtual CORBA::Long get_dscp_codepoint (void);
-  
+
   virtual void rt_service_context (TAO_Stub *stub,
                                    TAO_Service_Context &service_context,
                                    CORBA::Boolean restart
                                    ACE_ENV_ARG_DECL);
-  
+
   virtual void add_rt_service_context_hook (TAO_Service_Context &service_context,
                                             CORBA::Policy *model_policy,
                                             CORBA::Short &client_priority
                                             ACE_ENV_ARG_DECL);
-  
+
   virtual void get_selector_hook (CORBA::Policy *model_policy,
                                   CORBA::Boolean
                                   &is_client_propagated,
diff --git a/TAO/tao/RTCORBA/RT_Stub.h b/TAO/tao/RTCORBA/RT_Stub.h
index 9c5e0fe4ee6..64a23f09b87 100644
--- a/TAO/tao/RTCORBA/RT_Stub.h
+++ b/TAO/tao/RTCORBA/RT_Stub.h
@@ -35,7 +35,8 @@ class TAO_PrivateConnectionPolicy;
 /**
  * @class TAO_RT_Stub
  *
- * This class reprent a stub with extended functionality, which are needed for RTCORBA.
+ * This class represent a stub with extended functionality, which are needed
+ * for RTCORBA.
  */
 class TAO_RTCORBA_Export TAO_RT_Stub : public TAO_Stub
 {
diff --git a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
index 3d86903c910..716d0f4d430 100644
--- a/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
+++ b/TAO/tao/RTCORBA/RT_Thread_Lane_Resources_Manager.h
@@ -52,7 +52,7 @@ public:
   /// Shutdown reactor.
   void shutdown_reactor (void);
 
-  // Does <mprofile> belong to us?
+  /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// @name Accessors
diff --git a/TAO/tao/RTCORBA/Thread_Pool.h b/TAO/tao/RTCORBA/Thread_Pool.h
index 9e18d09619f..f633ae1a6bd 100644
--- a/TAO/tao/RTCORBA/Thread_Pool.h
+++ b/TAO/tao/RTCORBA/Thread_Pool.h
@@ -123,13 +123,13 @@ public:
   /// Wait for threads to exit.
   void wait (void);
 
-  // Does <mprofile> belong to us?
+  /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create the static threads - only called once.
   int create_static_threads (void);
 
-  /// Create <number_of_threads> of dynamic threads.  Can be called
+  /// Create @a number_of_threads of dynamic threads.  Can be called
   /// multiple times.
   int create_dynamic_threads (CORBA::ULong number_of_threads);
 
@@ -232,7 +232,7 @@ public:
   /// Wait for threads to exit.
   void wait (void);
 
-  // Does <mprofile> belong to us?
+  /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create the static threads - only called once.
@@ -303,7 +303,7 @@ public:
   /// Wait for threads to exit.
   void wait (void);
 
-  // Does <mprofile> belong to us?
+  /// Does @a mprofile belong to us?
   int is_collocated (const TAO_MProfile &mprofile);
 
   /// Create a threadpool without lanes.
diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h
index 066ea9db029..e0aa6204fb2 100644
--- a/TAO/tao/Server_Strategy_Factory.h
+++ b/TAO/tao/Server_Strategy_Factory.h
@@ -49,8 +49,8 @@ public:
 
   struct Active_Object_Map_Creation_Parameters
   {
+    /// Constructor.
     Active_Object_Map_Creation_Parameters (void);
-    // Constructor.
 
     CORBA::ULong active_object_map_size_;
     // Default size of object lookup table.
diff --git a/TAO/tao/Transport.cpp b/TAO/tao/Transport.cpp
index 2d630961eaa..fae8fa4c7b8 100644
--- a/TAO/tao/Transport.cpp
+++ b/TAO/tao/Transport.cpp
@@ -1704,7 +1704,7 @@ TAO_Transport::consolidate_message_queue (ACE_Message_Block &incoming,
     }
 
   // If the queue did not have a complete message put this piece of
-  // message in the queue. We kow it did not have a complete
+  // message in the queue. We know it did not have a complete
   // message. That is why we are here.
   size_t n =
     this->incoming_message_queue_.copy_tail (incoming);
@@ -1712,8 +1712,8 @@ TAO_Transport::consolidate_message_queue (ACE_Message_Block &incoming,
   if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) TAO_Transport[%d]::consolidate_message_queue",
-                  "copied [%d] bytes to the tail \n",
+                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
+                  "copied [%d] bytes to the tail\n",
                   this->id (),
                   n));
     }
@@ -1725,14 +1725,14 @@ TAO_Transport::consolidate_message_queue (ACE_Message_Block &incoming,
   if (TAO_debug_level > 6)
     {
       ACE_DEBUG ((LM_DEBUG,
-                  "(%P|%t) TAO_Transport[%d]::consolidate_message_queue",
-                  "missing [%d] bytes in the tail messahe \n",
+                  "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
+                  "missing [%d] bytes in the tail message\n",
                   this->id (),
                   missing_data));
     }
 
   // Move the read pointer of the <incoming> message block to the end
-  // of the copied message  and process the remaining portion...
+  // of the copied message and process the remaining portion...
   incoming.rd_ptr (n);
 
   // If we have some more information left in the message block..
@@ -1802,8 +1802,8 @@ TAO_Transport::consolidate_message_queue (ACE_Message_Block &incoming,
 
       if (TAO_debug_level > 5)
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) TAO_Transport[%d]::consolidate_message_queue",
-                    " trying recv, again \n",
+                    "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
+                    "trying recv, again\n",
                     this->id ()));
 
       // Try to do a read again. If we have some luck it would be
@@ -1814,8 +1814,8 @@ TAO_Transport::consolidate_message_queue (ACE_Message_Block &incoming,
 
       if (TAO_debug_level > 5)
         ACE_DEBUG ((LM_DEBUG,
-                    "(%P|%t) TAO_Transport[%d]::consolidate_message_queue",
-                    " recv retval [%d] \n",
+                    "TAO (%P|%t) - Transport[%d]::consolidate_message_queue, "
+                    "recv retval [%d]\n",
                     this->id (),
                     n));
       // Error...
diff --git a/TAO/tao/Transport_Cache_Manager.cpp b/TAO/tao/Transport_Cache_Manager.cpp
index 656ddee570d..eb23ede059a 100644
--- a/TAO/tao/Transport_Cache_Manager.cpp
+++ b/TAO/tao/Transport_Cache_Manager.cpp
@@ -141,7 +141,7 @@ TAO_Transport_Cache_Manager::bind_i (TAO_Cache_ExtId &ext_id,
     {
       ACE_DEBUG ((LM_DEBUG,
                   "TAO (%P|%t) - Transport_Cache_Manager::bind_i, "
-                  " size is [%d] \n",
+                  "size is [%d]\n",
                   this->current_size ()));
     }
 
@@ -368,7 +368,7 @@ TAO_Transport_Cache_Manager::purge_entry_i (HASH_MAP_ENTRY *&entry)
     return 0;
 
   // Remove the entry from the Map
- int retval = this->cache_map_.unbind (entry);
+  int retval = this->cache_map_.unbind (entry);
 
   // Set the entry pointer to zero
   entry = 0;
diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
index d3268d08692..9749a703b84 100644
--- a/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
+++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory_i.h
@@ -41,11 +41,11 @@ class TAO_TypeCodeFactory_Export TAO_TypeCodeFactory_i
  * Implementation of the CORBA::TypeCodeFactory interface
  */
 public:
-  TAO_TypeCodeFactory_i (void);
   /// ctor
+  TAO_TypeCodeFactory_i (void);
 
-  ~TAO_TypeCodeFactory_i (void);
   /// dtor
+  ~TAO_TypeCodeFactory_i (void);
 
   /// = LocalObject methods
   static TAO_TypeCodeFactory_i *_narrow (
diff --git a/TAO/tao/ValueFactory_Map.cpp b/TAO/tao/ValueFactory_Map.cpp
index 214085bc2f7..d43b139f1c2 100644
--- a/TAO/tao/ValueFactory_Map.cpp
+++ b/TAO/tao/ValueFactory_Map.cpp
@@ -123,5 +123,8 @@ template class TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>;
 #pragma instantiate ACE_Hash_Map_Entry<const char *, CORBA::ValueFactoryBase *>
 #pragma instantiate TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>
 
+#elif defined (__GNUC__) && (defined (_AIX) || defined (__hpux) || defined (VXWORKS))
+template TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX> * TAO_Singleton<TAO_ValueFactory_Map, TAO_SYNCH_MUTEX>::singleton_;
+
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */