ChangeLogTag:Fri Feb 8 12:25:55 2002 Carlos O'Ryan <coryan@uci.edu>

13 files changed, 224 insertions, 39 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 0f25f9b19d0..b4e4045b7c6 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,33 @@
+Fri Feb  8 12:25:55 2002  Carlos O'Ryan  <coryan@uci.edu>
+
+	* ObjectReferenceTemplateC.h:
+	* diffs/ObjectReferenceTemplate.diff:
+	  Add missing #include for "tao/Exception.h".
+
+	* Domain/DomainS.cpp:
+	* diffs/Domain.diff:
+	  Since we link TAO_IFR_Client we can use the CORBA::InterfaceDef
+	  operators directly instead of using the IFR_Client_Adapter, that
+	  makes the patches shorter and, therefore, makes for easier long
+	  term maintainance.
+	
+	* Domain/DomainS.h:
+	* diffs/Domain.diff:
+	  Fixed the export macros.
+
+	* PortableServer/Default_ORTC.cpp:
+	* PortableServer/diffs/Default_ORT.diff:
+	  Add missing #include for "tao/ValueFactory.h", only required in
+	  minimum CORBA builds.
+
+	* PortableServer/ObjectReferenceFactory.h:
+	* PortableServer/ObjectReferenceTemplate.h:
+	  Fixed throw specs for make_object()
+
+	* diffs/Policy.diff:
+	  Generate a new patch file that includes the export macro changes
+	  on the PolicyS.h file.
+
 Fri Feb  8 13:55:44 2002  Balachandran Natarajan  <bala@cs.wustl.edu>
 
 	* tests/Xt_Stopwatch/server.cpp (main): Added a patch for single
diff --git a/TAO/tao/Domain/DomainS.cpp b/TAO/tao/Domain/DomainS.cpp
index 8db62052e7f..1646dc2e8b5 100644
--- a/TAO/tao/Domain/DomainS.cpp
+++ b/TAO/tao/Domain/DomainS.cpp
@@ -39,8 +39,8 @@
 #include "tao/PortableServer/ServerInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
-#include "ace/Dynamic_Service.h"
 #include "tao/IFR_Client/IFR_ExtendedC.h"
+#include "ace/Dynamic_Service.h"
 
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus
@@ -933,18 +933,10 @@ TAO_ServerRequestInfo_CORBA_ConstructionPolicy_make_domain_manager::arguments (A
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
 
-  TAO_IFR_Client_Adapter *adapter =
-    ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance (
-        TAO_ORB_Core::ifr_client_adapter_name ()
-      );
-
   parameter_list->length (2);
   CORBA::ULong len = 0;
 
-  adapter->interfacedef_any_insert (
-      (*parameter_list)[len].argument,
-      this->object_type_
-    );
+    (*parameter_list)[len].argument <<= this->object_type_;
   (*parameter_list)[len].mode = CORBA::PARAM_IN;
   len++;
     (*parameter_list)[len].argument <<= CORBA::Any::from_boolean (this->constr_policy_);
diff --git a/TAO/tao/Domain/DomainS.h b/TAO/tao/Domain/DomainS.h
index 8d84903e56b..bc756b12d54 100644
--- a/TAO/tao/Domain/DomainS.h
+++ b/TAO/tao/Domain/DomainS.h
@@ -23,6 +23,8 @@
 #define _TAO_IDL_ORIG_DOMAINS_H_
 
 #include "ace/pre.h"
+
+#include "domain_export.h"
 #include "tao/PortableServer/PolicyS.h"
 #include "tao/DomainC.h"
 
@@ -57,7 +59,7 @@ TAO_NAMESPACE  POA_CORBA
   class _TAO_DomainManager_Direct_Proxy_Impl;
   class _TAO_DomainManager_Strategized_Proxy_Broker;
 
-  class TAO_Export DomainManager
+  class TAO_Domain_Export DomainManager
     : public virtual PortableServer::ServantBase
   {
   protected:
@@ -133,7 +135,7 @@ TAO_NAMESPACE  POA_CORBA
   //               Strategized Proxy Broker Declaration
   //
 
-  class TAO_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_DomainManager_Proxy_Broker
+  class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_DomainManager_Proxy_Broker
   {
   public:
     _TAO_DomainManager_Strategized_Proxy_Broker (void);
@@ -178,7 +180,7 @@ TAO_NAMESPACE  POA_CORBA
   //                    ThruPOA  Impl. Declaration
   //
 
-  class TAO_Export _TAO_DomainManager_ThruPOA_Proxy_Impl :
+  class TAO_Domain_Export _TAO_DomainManager_ThruPOA_Proxy_Impl :
     public virtual ::CORBA::_TAO_DomainManager_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl
   {
@@ -208,7 +210,7 @@ TAO_NAMESPACE  POA_CORBA
 //                    Direct  Impl. Declaration
 //
 
-class TAO_Export _TAO_DomainManager_Direct_Proxy_Impl :
+class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl :
   public virtual CORBA::_TAO_DomainManager_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
@@ -241,7 +243,7 @@ class _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl;
 class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
 class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
 
-class TAO_Export ConstructionPolicy
+class TAO_Domain_Export ConstructionPolicy
   : public virtual POA_CORBA::Policy
 {
 protected:
@@ -339,7 +341,7 @@ public:
 //               Strategized Proxy Broker Declaration
 //
 
-class TAO_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Broker
+class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Broker
 {
 public:
   _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
@@ -384,7 +386,7 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class TAO_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl :
+class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl :
   public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl
@@ -417,7 +419,7 @@ public:
 //                    Direct  Impl. Declaration
 //
 
-class TAO_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl :
+class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl :
   public virtual CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl,
   public virtual POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
diff --git a/TAO/tao/ObjectReferenceTemplateC.h b/TAO/tao/ObjectReferenceTemplateC.h
index 4a2f4d8720c..eb493154b07 100644
--- a/TAO/tao/ObjectReferenceTemplateC.h
+++ b/TAO/tao/ObjectReferenceTemplateC.h
@@ -33,6 +33,7 @@
 #include "OctetSeqC.h"
 #include "StringSeqC.h"
 #include "ValueBase.h"
+#include "Exception.h"
 
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp
index e88494c1f57..ae7a24a82f0 100644
--- a/TAO/tao/PortableServer/Default_ORTC.cpp
+++ b/TAO/tao/PortableServer/Default_ORTC.cpp
@@ -31,6 +31,8 @@
 #include "tao/ClientInterceptorAdapter.h"
 #endif  /* TAO_HAS_INTERCEPTORS == 1 */
 
+#include "tao/ValueFactory.h"
+
 #if defined (__BORLANDC__)
 #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
 #endif /* __BORLANDC__ */
diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp
index 02732b62984..fcb384599f5 100644
--- a/TAO/tao/PortableServer/ObjectReferenceFactory.cpp
+++ b/TAO/tao/PortableServer/ObjectReferenceFactory.cpp
@@ -24,10 +24,13 @@ TAO_ObjectReferenceFactory::TAO_ObjectReferenceFactory (TAO_POA *poa)
 }
 
 CORBA::Object *
-TAO_ObjectReferenceFactory::make_object (const char *intf,
-                                         const PortableInterceptor::ObjectId & id
-                                         ACE_ENV_ARG_DECL)
-
+TAO_ObjectReferenceFactory::make_object (
+    const char *intf,
+    const PortableInterceptor::ObjectId & id
+    ACE_ENV_ARG_DECL)
+  ACE_THROW_SPEC ((
+    CORBA::SystemException
+  ))
 {
   CORBA::OctetSeq object_id = id;
 
diff --git a/TAO/tao/PortableServer/ObjectReferenceFactory.h b/TAO/tao/PortableServer/ObjectReferenceFactory.h
index 9743aedfa4d..74c5d630c38 100644
--- a/TAO/tao/PortableServer/ObjectReferenceFactory.h
+++ b/TAO/tao/PortableServer/ObjectReferenceFactory.h
@@ -55,7 +55,10 @@ class TAO_PortableServer_Export TAO_ObjectReferenceFactory
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
       const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
 
   void set_servant (PortableServer::Servant servant);
 
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
index 25c44c8cdf7..dc5664d3e19 100644
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.cpp
@@ -60,11 +60,12 @@ TAO_ObjectReferenceTemplate::adapter_name (ACE_ENV_SINGLE_ARG_DECL_NOT_USED)
 // @@ Priyanka, technically this should be CORBA::Object_ptr!
 CORBA::Object *
 TAO_ObjectReferenceTemplate::make_object (
-  const char * intf,
-  const PortableInterceptor::ObjectId & id
+    const char * intf,
+    const PortableInterceptor::ObjectId & id
   ACE_ENV_ARG_DECL)
-  // @@ Priyanka, is this method supposed to have an exception
-  //    specification?
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ))
 {
   CORBA::OctetSeq object_id = id;
 
diff --git a/TAO/tao/PortableServer/ObjectReferenceTemplate.h b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
index a30e938e38a..e99a05e0d20 100644
--- a/TAO/tao/PortableServer/ObjectReferenceTemplate.h
+++ b/TAO/tao/PortableServer/ObjectReferenceTemplate.h
@@ -69,7 +69,10 @@ class TAO_PortableServer_Export TAO_ObjectReferenceTemplate
   virtual CORBA::Object_ptr make_object (
       const char * repository_id,
       const PortableInterceptor::ObjectId & id
-      ACE_ENV_ARG_DECL_WITH_DEFAULTS);
+      ACE_ENV_ARG_DECL_WITH_DEFAULTS)
+    ACE_THROW_SPEC ((
+      CORBA::SystemException
+    ));
 
   void destroy (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
diff --git a/TAO/tao/PortableServer/diffs/Default_ORT.diff b/TAO/tao/PortableServer/diffs/Default_ORT.diff
index a15419bd6fd..7e00820e756 100644
--- a/TAO/tao/PortableServer/diffs/Default_ORT.diff
+++ b/TAO/tao/PortableServer/diffs/Default_ORT.diff
@@ -1,5 +1,5 @@
 --- orig/Default_ORTC.h	Thu Feb  7 15:05:40 2002
-+++ Default_ORTC.h	Thu Feb  7 15:06:51 2002
++++ Default_ORTC.h	Fri Feb  8 11:25:49 2002
 @@ -23,14 +23,14 @@
  #define _TAO_IDL_ORIG_DEFAULT_ORTC_H_
  
@@ -17,3 +17,14 @@
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
+--- orig/Default_ORTC.cpp	Thu Feb  7 15:05:40 2002
++++ Default_ORTC.cpp	Fri Feb  8 11:26:35 2002
+@@ -31,6 +31,8 @@
+ #include "tao/ClientInterceptorAdapter.h"
+ #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+ 
++#include "tao/ValueFactory.h"
++
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus -w-sig
+ #endif /* __BORLANDC__ */
diff --git a/TAO/tao/diffs/Domain.diff b/TAO/tao/diffs/Domain.diff
index 514400a489c..df53c3da6e1 100644
--- a/TAO/tao/diffs/Domain.diff
+++ b/TAO/tao/diffs/Domain.diff
@@ -1,5 +1,5 @@
 --- orig/DomainC.h	Mon Feb  4 17:27:57 2002
-+++ DomainC.h	Mon Feb  4 17:28:11 2002
++++ DomainC.h	Fri Feb  8 10:50:20 2002
 @@ -31,7 +31,7 @@
  
  #include "TAO_Export.h"
@@ -10,7 +10,7 @@
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
 --- orig/DomainC.cpp	Mon Feb  4 17:27:57 2002
-+++ DomainC.cpp	Tue Feb  5 13:46:30 2002
++++ DomainC.cpp	Fri Feb  8 10:50:20 2002
 @@ -31,6 +31,9 @@
  #include "tao/ClientInterceptorAdapter.h"
  #endif  /* TAO_HAS_INTERCEPTORS == 1 */
@@ -59,3 +59,103 @@
                (_tao_out << CORBA::Any::from_boolean (constr_policy))
              ))
              TAO_INTERCEPTOR_THROW (
+--- orig/DomainS.h	Mon Feb  4 17:27:57 2002
++++ Domain/DomainS.h	Fri Feb  8 10:53:14 2002
+@@ -23,9 +23,10 @@
+ #define _TAO_IDL_ORIG_DOMAINS_H_
+ 
+ #include "ace/pre.h"
+-#include "PolicyS.h"
+-#include "InterfaceDefS.h"
+-#include "DomainC.h"
++
++#include "domain_export.h"
++#include "tao/PortableServer/PolicyS.h"
++#include "tao/DomainC.h"
+ 
+ 
+ #if !defined (ACE_LACKS_PRAGMA_ONCE)
+@@ -58,7 +59,7 @@
+   class _TAO_DomainManager_Direct_Proxy_Impl;
+   class _TAO_DomainManager_Strategized_Proxy_Broker;
+   
+-  class TAO_Export DomainManager
++  class TAO_Domain_Export DomainManager
+     : public virtual PortableServer::ServantBase
+   {
+   protected:
+@@ -134,7 +135,7 @@
+   //               Strategized Proxy Broker Declaration 
+   //
+   
+-  class TAO_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_DomainManager_Proxy_Broker
++  class TAO_Domain_Export _TAO_DomainManager_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_DomainManager_Proxy_Broker
+   {
+   public: 
+     _TAO_DomainManager_Strategized_Proxy_Broker (void);
+@@ -179,7 +180,7 @@
+   //                    ThruPOA  Impl. Declaration
+   //
+   
+-  class TAO_Export _TAO_DomainManager_ThruPOA_Proxy_Impl : 
++  class TAO_Domain_Export _TAO_DomainManager_ThruPOA_Proxy_Impl :
+     public virtual ::CORBA::_TAO_DomainManager_Proxy_Impl,
+     public virtual TAO_ThruPOA_Object_Proxy_Impl
+   {
+@@ -209,7 +210,7 @@
+ //                    Direct  Impl. Declaration
+ //
+ 
+-class TAO_Export _TAO_DomainManager_Direct_Proxy_Impl : 
++class TAO_Domain_Export _TAO_DomainManager_Direct_Proxy_Impl :
+   public virtual CORBA::_TAO_DomainManager_Proxy_Impl,
+   public virtual TAO_Direct_Object_Proxy_Impl
+ {
+@@ -242,7 +243,7 @@
+ class _TAO_ConstructionPolicy_Direct_Proxy_Impl;
+ class _TAO_ConstructionPolicy_Strategized_Proxy_Broker;
+ 
+-class TAO_Export ConstructionPolicy
++class TAO_Domain_Export ConstructionPolicy
+   : public virtual POA_CORBA::Policy
+ {
+ protected:
+@@ -340,7 +341,7 @@
+ //               Strategized Proxy Broker Declaration 
+ //
+ 
+-class TAO_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Broker
++class TAO_Domain_Export _TAO_ConstructionPolicy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Broker
+ {
+ public: 
+   _TAO_ConstructionPolicy_Strategized_Proxy_Broker (void);
+@@ -385,7 +386,7 @@
+ //                    ThruPOA  Impl. Declaration
+ //
+ 
+-class TAO_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl : 
++class TAO_Domain_Export _TAO_ConstructionPolicy_ThruPOA_Proxy_Impl :
+   public virtual ::CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
+   public virtual TAO_ThruPOA_Object_Proxy_Impl,
+   public virtual ::POA_CORBA::_TAO_Policy_ThruPOA_Proxy_Impl
+@@ -418,7 +419,7 @@
+ //                    Direct  Impl. Declaration
+ //
+ 
+-class TAO_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl : 
++class TAO_Domain_Export _TAO_ConstructionPolicy_Direct_Proxy_Impl :
+   public virtual CORBA::_TAO_ConstructionPolicy_Proxy_Impl,
+   public virtual TAO_Direct_Object_Proxy_Impl,
+   public virtual POA_CORBA::_TAO_Policy_Direct_Proxy_Impl
+--- orig/DomainS.cpp	Mon Feb  4 17:27:57 2002
++++ Domain/DomainS.cpp	Fri Feb  8 11:17:22 2002
+@@ -39,7 +39,9 @@
+ #include "tao/PortableServer/ServerInterceptorAdapter.h"
+ #endif  /* TAO_HAS_INTERCEPTORS == 1 */
+ 
++#include "tao/IFR_Client/IFR_ExtendedC.h"
+ #include "ace/Dynamic_Service.h"
++
+ #if defined (__BORLANDC__)
+ #pragma option -w-rvl -w-rch -w-ccc -w-aus
+ #endif /* __BORLANDC__ */
diff --git a/TAO/tao/diffs/ObjectReferenceTemplate.diff b/TAO/tao/diffs/ObjectReferenceTemplate.diff
index d83ae273b6e..318dd1a4816 100644
--- a/TAO/tao/diffs/ObjectReferenceTemplate.diff
+++ b/TAO/tao/diffs/ObjectReferenceTemplate.diff
@@ -1,5 +1,5 @@
---- orig/ObjectReferenceTemplateC.h	Wed Feb  6 19:29:56 2002
-+++ ObjectReferenceTemplateC.h	Wed Feb  6 10:00:19 2002
+--- orig/ObjectReferenceTemplateC.h	Thu Feb  7 15:04:56 2002
++++ ObjectReferenceTemplateC.h	Fri Feb  8 11:23:31 2002
 @@ -23,7 +23,7 @@
  #define _TAO_IDL_ORIG_OBJECTREFERENCETEMPLATEC_H_
  
@@ -9,16 +9,17 @@
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
  # pragma once
-@@ -32,6 +32,7 @@
+@@ -32,6 +32,8 @@
  #include "TAO_Export.h"
  #include "OctetSeqC.h"
  #include "StringSeqC.h"
 +#include "ValueBase.h"
++#include "Exception.h"
  
  #if defined (TAO_EXPORT_MACRO)
  #undef TAO_EXPORT_MACRO
---- orig/ObjectReferenceTemplateC.cpp	Wed Feb  6 19:29:56 2002
-+++ ObjectReferenceTemplateC.cpp	Wed Feb  6 18:45:41 2002
+--- orig/ObjectReferenceTemplateC.cpp	Thu Feb  7 15:04:56 2002
++++ ObjectReferenceTemplateC.cpp	Fri Feb  8 11:23:01 2002
 @@ -24,6 +24,7 @@
  #include "tao/Stub.h"
  #include "tao/Invocation.h"
diff --git a/TAO/tao/diffs/Policy.diff b/TAO/tao/diffs/Policy.diff
index ad04c75b097..f7dc05fbd62 100644
--- a/TAO/tao/diffs/Policy.diff
+++ b/TAO/tao/diffs/Policy.diff
@@ -1,5 +1,5 @@
 --- orig/PolicyC.h	Wed Feb  6 19:31:31 2002
-+++ PolicyC.h	Wed Feb  6 19:34:42 2002
++++ PolicyC.h	Fri Feb  8 10:50:48 2002
 @@ -23,7 +23,7 @@
  #define _TAO_IDL_ORIG_POLICYC_H_
  
@@ -44,7 +44,7 @@
    private:
      _TAO_Policy_Proxy_Broker *the_TAO_Policy_Proxy_Broker_;
 --- orig/PolicyC.cpp	Wed Feb  6 19:31:31 2002
-+++ PolicyC.cpp	Wed Feb  6 19:34:42 2002
++++ PolicyC.cpp	Fri Feb  8 10:50:48 2002
 @@ -1678,6 +1678,32 @@
    return "IDL:omg.org/CORBA/Policy:1.0";
  }
@@ -79,7 +79,7 @@
      
      ACE_ENV_SINGLE_ARG_DECL
 --- orig/PolicyS.h	Wed Feb  6 19:31:31 2002
-+++ PortableServer/PolicyS.h	Wed Feb  6 19:35:15 2002
++++ PortableServer/PolicyS.h	Fri Feb  8 10:52:00 2002
 @@ -23,9 +23,7 @@
  #define _TAO_IDL_ORIG_POLICYS_H_
  
@@ -91,3 +91,39 @@
  
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
+@@ -58,7 +56,7 @@
+   class _TAO_Policy_Direct_Proxy_Impl;
+   class _TAO_Policy_Strategized_Proxy_Broker;
+   
+-  class TAO_Export Policy
++  class TAO_PortableServer_Export Policy
+     : public virtual PortableServer::ServantBase
+   {
+   protected:
+@@ -164,7 +162,7 @@
+   //               Strategized Proxy Broker Declaration 
+   //
+   
+-  class TAO_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
++  class TAO_PortableServer_Export _TAO_Policy_Strategized_Proxy_Broker : public virtual ::CORBA::_TAO_Policy_Proxy_Broker
+   {
+   public: 
+     _TAO_Policy_Strategized_Proxy_Broker (void);
+@@ -209,7 +207,7 @@
+   //                    ThruPOA  Impl. Declaration
+   //
+   
+-  class TAO_Export _TAO_Policy_ThruPOA_Proxy_Impl : 
++  class TAO_PortableServer_Export _TAO_Policy_ThruPOA_Proxy_Impl :
+     public virtual ::CORBA::_TAO_Policy_Proxy_Impl,
+     public virtual TAO_ThruPOA_Object_Proxy_Impl
+   {
+@@ -254,7 +252,7 @@
+ //                    Direct  Impl. Declaration
+ //
+ 
+-class TAO_Export _TAO_Policy_Direct_Proxy_Impl : 
++class TAO_PortableServer_Export _TAO_Policy_Direct_Proxy_Impl :
+   public virtual CORBA::_TAO_Policy_Proxy_Impl,
+   public virtual TAO_Direct_Object_Proxy_Impl
+ {