ChangeLogTag:Wed Jan 24 09:44:24 2001 Carlos O'Ryan <coryan@uci.edu>

17 files changed, 24 insertions, 21 deletions

diff --git a/TAO/tao/CORBALOC_Parser.h b/TAO/tao/CORBALOC_Parser.h
index 9f9fb5ca4c5..d4399129950 100644
--- a/TAO/tao/CORBALOC_Parser.h
+++ b/TAO/tao/CORBALOC_Parser.h
@@ -133,7 +133,7 @@ private:
 # include "CORBALOC_Parser.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_CORBALOC_Parser)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBALOC_Parser)
 ACE_FACTORY_DECLARE (TAO, TAO_CORBALOC_Parser)
 
 #include "ace/post.h"
diff --git a/TAO/tao/CORBANAME_Parser.h b/TAO/tao/CORBANAME_Parser.h
index 16ca242e6a4..aa51485b9a4 100644
--- a/TAO/tao/CORBANAME_Parser.h
+++ b/TAO/tao/CORBANAME_Parser.h
@@ -61,7 +61,7 @@ public:
 # include "CORBANAME_Parser.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_CORBANAME_Parser)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_CORBANAME_Parser)
 ACE_FACTORY_DECLARE (TAO, TAO_CORBANAME_Parser)
 
 #include "ace/post.h"
diff --git a/TAO/tao/Connection_Cache_Manager.cpp b/TAO/tao/Connection_Cache_Manager.cpp
index fddc6140112..cbb96715c3c 100644
--- a/TAO/tao/Connection_Cache_Manager.cpp
+++ b/TAO/tao/Connection_Cache_Manager.cpp
@@ -5,6 +5,7 @@
 #include "tao/debug.h"
 #include "tao/ORB_Core.h"
 
+#include "ace/Handle_Set.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Connection_Cache_Manager.inl"
diff --git a/TAO/tao/DLL_ORB.h b/TAO/tao/DLL_ORB.h
index bd73e5f8192..10d5685caa5 100644
--- a/TAO/tao/DLL_ORB.h
+++ b/TAO/tao/DLL_ORB.h
@@ -77,7 +77,7 @@ private:
 # include "tao/DLL_ORB.inl"
 #endif  /* ! __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_DLL_ORB)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_ORB)
 ACE_FACTORY_DECLARE (TAO, TAO_DLL_ORB)
 
 #include "ace/post.h"
diff --git a/TAO/tao/DLL_Parser.h b/TAO/tao/DLL_Parser.h
index 635f742665e..4b251899d5f 100644
--- a/TAO/tao/DLL_Parser.h
+++ b/TAO/tao/DLL_Parser.h
@@ -53,7 +53,7 @@ public:
 # include "DLL_Parser.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_DLL_Parser)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_DLL_Parser)
 ACE_FACTORY_DECLARE (TAO, TAO_DLL_Parser)
 
 #include "ace/post.h"
diff --git a/TAO/tao/Default_Protocols_Hooks.h b/TAO/tao/Default_Protocols_Hooks.h
index 4982d63f015..d1194721052 100644
--- a/TAO/tao/Default_Protocols_Hooks.h
+++ b/TAO/tao/Default_Protocols_Hooks.h
@@ -83,7 +83,7 @@ class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
   virtual CORBA::Policy *effective_client_protocol_hook (CORBA::Policy *override,
                                                          CORBA::Policy *exposed,
                                                          CORBA::Environment &);
-  
+
   /**
    * Accessor and modifier to the current thread priority, used to
    * implement the RTCORBA::Current interface, but it is faster for
@@ -103,7 +103,7 @@ class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
   virtual void set_priority_mapping (TAO_ORB_Core *,
                                      TAO_Resource_Factory *,
                                      CORBA::Environment &);
-  
+
   virtual int set_default_policies (TAO_ORB_Core *orb_core);
 
 };
@@ -112,7 +112,7 @@ class TAO_Export TAO_Default_Protocols_Hooks : public TAO_Protocols_Hooks
 #include "tao/Default_Protocols_Hooks.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_Default_Protocols_Hooks)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Protocols_Hooks)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Protocols_Hooks)
 
 #include "ace/post.h"
diff --git a/TAO/tao/FILE_Parser.h b/TAO/tao/FILE_Parser.h
index 899f184682e..1cb5b4839f8 100644
--- a/TAO/tao/FILE_Parser.h
+++ b/TAO/tao/FILE_Parser.h
@@ -53,7 +53,7 @@ public:
 # include "FILE_Parser.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_FILE_Parser)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_FILE_Parser)
 ACE_FACTORY_DECLARE (TAO, TAO_FILE_Parser)
 
 #include "ace/post.h"
diff --git a/TAO/tao/IIOP_Factory.h b/TAO/tao/IIOP_Factory.h
index ac96b4d83da..0a84fc70b5d 100644
--- a/TAO/tao/IIOP_Factory.h
+++ b/TAO/tao/IIOP_Factory.h
@@ -58,7 +58,7 @@ private:
   int minor_;
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_IIOP_Protocol_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Protocol_Factory)
 
 #include "ace/post.h"
diff --git a/TAO/tao/IIOP_Lite_Factory.h b/TAO/tao/IIOP_Lite_Factory.h
index 3a264db4486..77832372de3 100644
--- a/TAO/tao/IIOP_Lite_Factory.h
+++ b/TAO/tao/IIOP_Lite_Factory.h
@@ -60,7 +60,7 @@ private:
   int minor_;
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_IIOP_Lite_Protocol_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_IIOP_Lite_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_IIOP_Lite_Protocol_Factory)
 
 #include "ace/post.h"
diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h
index 7a06e31e103..6afaa550605 100644
--- a/TAO/tao/Protocols_Hooks.h
+++ b/TAO/tao/Protocols_Hooks.h
@@ -108,7 +108,7 @@ public:
   virtual void set_priority_mapping (TAO_ORB_Core *,
                                      TAO_Resource_Factory *,
                                      CORBA::Environment &);
-  
+
   /// Sets the default_policies for ORB.
   /// 1. Sets ORB-level policy defaults for this ORB.  Currently sets
   /// default RTCORBA policies: ServerProtocolPolicy and
diff --git a/TAO/tao/RT_ORB_Loader.h b/TAO/tao/RT_ORB_Loader.h
index 01f1b7d04d5..e3b9d2e3c74 100644
--- a/TAO/tao/RT_ORB_Loader.h
+++ b/TAO/tao/RT_ORB_Loader.h
@@ -31,19 +31,19 @@ public:
 
   /// Constructor
   TAO_RT_ORB_Loader (void);
-  
+
   /// Creates a RT_ORB and returns it.
   virtual CORBA::Object_ptr create_object (CORBA::ORB_ptr orb,
                                            int argc,
                                            char *argv [],
                                            CORBA::Environment &)
     ACE_THROW_SPEC (());
-  
+
   /// Sets RT_Current and Priority_Mapping_Manager
   void set_objects (TAO_ORB_Core *orb_core);
 };
 
-ACE_STATIC_SVC_DECLARE (TAO_RT_ORB_Loader)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_RT_ORB_Loader)
 ACE_FACTORY_DECLARE (TAO, TAO_RT_ORB_Loader)
 
 #include "ace/post.h"
diff --git a/TAO/tao/RT_Protocols_Hooks.h b/TAO/tao/RT_Protocols_Hooks.h
index 0f942ffbe4b..53c9f433cb0 100644
--- a/TAO/tao/RT_Protocols_Hooks.h
+++ b/TAO/tao/RT_Protocols_Hooks.h
@@ -19,6 +19,8 @@
 
 #if (TAO_HAS_RT_CORBA == 1)
 
+#include "ace/Service_Config.h"
+
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
@@ -59,7 +61,7 @@ public:
 
   /// The hook to be set for the ClientProtocolPolicy.
   static Client_Protocols_Hook client_protocols_hook_;
- 
+
   /// Invoke the server_protocols hook if present.
   /**
    * The timeout hook is used to determine if the client_protocols policy is
diff --git a/TAO/tao/default_client.h b/TAO/tao/default_client.h
index 4cadec5cd4a..c67562af488 100644
--- a/TAO/tao/default_client.h
+++ b/TAO/tao/default_client.h
@@ -89,7 +89,7 @@ private:
 # include "tao/default_client.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_Default_Client_Strategy_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Client_Strategy_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Client_Strategy_Factory)
 
 #include "ace/post.h"
diff --git a/TAO/tao/default_resource.h b/TAO/tao/default_resource.h
index 0886ca7affc..a9b2c85e2ee 100644
--- a/TAO/tao/default_resource.h
+++ b/TAO/tao/default_resource.h
@@ -173,7 +173,7 @@ private:
 #include "tao/default_resource.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_Default_Resource_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Resource_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Resource_Factory)
 
 #include "ace/post.h"
diff --git a/TAO/tao/default_server.h b/TAO/tao/default_server.h
index 0ad1637d996..89487ff8976 100644
--- a/TAO/tao/default_server.h
+++ b/TAO/tao/default_server.h
@@ -95,7 +95,7 @@ protected:
 # include "tao/default_server.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_Default_Server_Strategy_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_Default_Server_Strategy_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_Default_Server_Strategy_Factory)
 
 #include "ace/post.h"
diff --git a/TAO/tao/qt_resource.h b/TAO/tao/qt_resource.h
index 59887c2d52e..d349b3dca6b 100644
--- a/TAO/tao/qt_resource.h
+++ b/TAO/tao/qt_resource.h
@@ -55,8 +55,8 @@ private:
 #include "tao/qt_resource.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE( TAO_QtResource_Factory )
-ACE_FACTORY_DECLARE   ( TAO, TAO_QtResource_Factory )
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_QtResource_Factory)
+ACE_FACTORY_DECLARE (TAO, TAO_QtResource_Factory)
 
 #endif /*ACE_HAS_QT */
 #include "ace/post.h"
diff --git a/TAO/tao/xt_resource.h b/TAO/tao/xt_resource.h
index a44c035a8ac..59dceb35745 100644
--- a/TAO/tao/xt_resource.h
+++ b/TAO/tao/xt_resource.h
@@ -59,7 +59,7 @@ private:
 #include "tao/xt_resource.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_STATIC_SVC_DECLARE (TAO_XT_Resource_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_XT_Resource_Factory)
 ACE_FACTORY_DECLARE (TAO, TAO_XT_Resource_Factory)
 
 #endif /* ACE_HAS_XT */