ChangeLogTag:Sun Apr 1 18:35:16 2001 Carlos O'Ryan <coryan@uci.edu>

3 files changed, 43 insertions, 16 deletions

diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index f275f9481ff..bf0bdf11ed5 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,10 +1,17 @@
+Sun Apr  1 18:35:16 2001  Carlos O'Ryan  <coryan@uci.edu>
+
+        * tao/PortableServer/MessagingS.h:
+        * tao/diffs/MessagingS.h.diff:
+          Fixed export macros.  The IDL compiler options were targeted for
+          the TAO library, but this file goes into TAO_PortableServer.
+
 Sun Apr  1 18:18:45 2001  Mayur Deshpande  <mayur@balar.ece.uci.edu>
 
-	* docs/tutorials/Quoter/On_Demand_Activation/index.html: 
-	* docs/tutorials/Quoter/Simple/Persistent/index.html: 
-	* docs/tutorials/Quoter/Simple/Impl-Repo/index.html: 
-	* docs/tutorials/Quoter/Simple/ImprovedServer/index.html: Changed
-	~schmidt/ACE_wrappers links to point to relative files 
+        * docs/tutorials/Quoter/On_Demand_Activation/index.html:
+        * docs/tutorials/Quoter/Simple/Persistent/index.html:
+        * docs/tutorials/Quoter/Simple/Impl-Repo/index.html:
+        * docs/tutorials/Quoter/Simple/ImprovedServer/index.html: Changed
+        ~schmidt/ACE_wrappers links to point to relative files
 
 Sun Apr  1 17:44:30 2001  Carlos O'Ryan  <coryan@uci.edu>
 
diff --git a/TAO/tao/PortableServer/MessagingS.h b/TAO/tao/PortableServer/MessagingS.h
index 778aa34f741..3a4180e6f0e 100644
--- a/TAO/tao/PortableServer/MessagingS.h
+++ b/TAO/tao/PortableServer/MessagingS.h
@@ -66,7 +66,7 @@ TAO_NAMESPACE  POA_Messaging
   class _TAO_ReplyHandler_Direct_Proxy_Impl;
   class _TAO_ReplyHandler_Strategized_Proxy_Broker;
 
-  class TAO_Export ReplyHandler :  public virtual PortableServer::ServantBase
+  class TAO_PortableServer_Export ReplyHandler :  public virtual PortableServer::ServantBase
   {
   protected:
     ReplyHandler (void);
@@ -139,7 +139,7 @@ TAO_NAMESPACE  POA_Messaging
   //               Strategized Proxy Broker Declaration
   //
 
-  class TAO_Export _TAO_ReplyHandler_Strategized_Proxy_Broker : public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Broker
+  class TAO_PortableServer_Export _TAO_ReplyHandler_Strategized_Proxy_Broker : public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Broker
   {
   public:
     _TAO_ReplyHandler_Strategized_Proxy_Broker (void);
@@ -187,7 +187,7 @@ TAO_NAMESPACE  POA_Messaging
 //                    ThruPOA  Impl. Declaration
 //
 
-class TAO_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl :
   public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
@@ -208,7 +208,7 @@ public:
 //                    Direct  Impl. Declaration
 //
 
-class TAO_Export _TAO_ReplyHandler_Direct_Proxy_Impl :
+class TAO_PortableServer_Export _TAO_ReplyHandler_Direct_Proxy_Impl :
   public virtual Messaging::_TAO_ReplyHandler_Proxy_Impl,
   public virtual TAO_Direct_Object_Proxy_Impl
 {
@@ -228,7 +228,7 @@ public:
 #if defined (ACE_HAS_USING_KEYWORD)
 // TIE class: Refer to CORBA v2.2, Section 20.34.4
 template <class T>
-class TAO_Export ReplyHandler_tie : public ReplyHandler
+class TAO_PortableServer_Export ReplyHandler_tie : public ReplyHandler
 {
 public:
   ReplyHandler_tie (T &t);
diff --git a/TAO/tao/diffs/MessagingS.h.diff b/TAO/tao/diffs/MessagingS.h.diff
index 6bc7aefe44c..ac5249e24c8 100644
--- a/TAO/tao/diffs/MessagingS.h.diff
+++ b/TAO/tao/diffs/MessagingS.h.diff
@@ -1,5 +1,13 @@
 --- orig/MessagingS.h	Sat Mar 31 14:51:18 2001
-+++ PortableServer/MessagingS.h	Sat Mar 31 17:44:37 2001
++++ PortableServer/MessagingS.h	Sun Apr  1 18:33:16 2001
+@@ -1,6 +1,6 @@
+ // -*- C++ -*-
+ //
+-// $Id$
++// $Id$
+ 
+ // ****  Code generated by the The ACE ORB (TAO) IDL Compiler ****
+ // TAO and the TAO IDL Compiler have been developed by:
 @@ -23,11 +23,13 @@
  #define _TAO_IDL_ORIG_MESSAGINGS_H_
  
@@ -19,7 +27,7 @@
  
  
  #if !defined (ACE_LACKS_PRAGMA_ONCE)
-@@ -54,13 +56,16 @@
+@@ -54,14 +56,17 @@
  
  TAO_NAMESPACE  POA_Messaging
  {
@@ -33,10 +41,12 @@
    class _TAO_ReplyHandler_Direct_Proxy_Impl;
    class _TAO_ReplyHandler_Strategized_Proxy_Broker;
 -  
+-  class TAO_Export ReplyHandler :  public virtual PortableServer::ServantBase
 +
-   class TAO_Export ReplyHandler :  public virtual PortableServer::ServantBase
++  class TAO_PortableServer_Export ReplyHandler :  public virtual PortableServer::ServantBase
    {
    protected:
+     ReplyHandler (void);
 @@ -73,7 +78,7 @@
  
      virtual CORBA::Boolean _is_a (
@@ -105,8 +115,9 @@
 +  //               Strategized Proxy Broker Declaration
    //
 -  
+-  class TAO_Export _TAO_ReplyHandler_Strategized_Proxy_Broker : public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Broker
 +
-   class TAO_Export _TAO_ReplyHandler_Strategized_Proxy_Broker : public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Broker
++  class TAO_PortableServer_Export _TAO_ReplyHandler_Strategized_Proxy_Broker : public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Broker
    {
 -  public: 
 +  public:
@@ -169,7 +180,7 @@
  //
  
 -class TAO_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl : 
-+class TAO_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl :
++class TAO_PortableServer_Export _TAO_ReplyHandler_ThruPOA_Proxy_Impl :
    public virtual ::Messaging::_TAO_ReplyHandler_Proxy_Impl,
    public virtual TAO_ThruPOA_Object_Proxy_Impl
  {
@@ -188,7 +199,7 @@
  //
  
 -class TAO_Export _TAO_ReplyHandler_Direct_Proxy_Impl : 
-+class TAO_Export _TAO_ReplyHandler_Direct_Proxy_Impl :
++class TAO_PortableServer_Export _TAO_ReplyHandler_Direct_Proxy_Impl :
    public virtual Messaging::_TAO_ReplyHandler_Proxy_Impl,
    public virtual TAO_Direct_Object_Proxy_Impl
  {
@@ -202,6 +213,15 @@
    };
  
  
+@@ -223,7 +228,7 @@
+ #if defined (ACE_HAS_USING_KEYWORD)
+ // TIE class: Refer to CORBA v2.2, Section 20.34.4
+ template <class T>
+-class TAO_Export ReplyHandler_tie : public ReplyHandler
++class TAO_PortableServer_Export ReplyHandler_tie : public ReplyHandler
+ {
+ public:
+   ReplyHandler_tie (T &t);
 @@ -236,7 +241,7 @@
    // ctor with T*, ownership flag and a POA
    ~ReplyHandler_tie (void);