ChangeLogTag: Mon Jun 09 10:08:12 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>

11 files changed, 63 insertions, 30 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 37628e570ba..488c32edd54 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,21 @@
+Mon Jun  9 10:09:52 UTC 2003  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Strategies/Makefile.bor:
+          Added SCIOP files.
+
+        * tao/Strategies/SCIOP_Acceptor.h:
+        * tao/Strategies/SCIOP_Connection_Handler.h:
+        * tao/Strategies/SCIOP_Connector.h:
+        * tao/Strategies/SCIOP_Endpoint.h:
+        * tao/Strategies/sciop_endpoints.h:
+        * tao/Strategies/SCIOP_Factory.h:
+        * tao/Strategies/SCIOP_Lite_Factory.h:
+        * tao/Strategies/SCIOP_Profile.h:
+        * tao/Strategies/SCIOP_Transport.h:
+          Changed TAO_Export to TAO_Strategies_Export to correctly
+          export/import these classes from a DLL. Added missing includes
+          to pickup these defines.
+
 Sun Jun  8 23:21:45 2003  Jeff Parsons <j.parsons@vanderbilt.edu>
 
         * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp:
@@ -19,7 +37,7 @@ Sun Jun  8 18:50:29 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* performance-tests/Sequence_Latency/Single_Threaded: New test for
 	  tracking performance of sequence<basic types>. Our code
-	  generatiom for sequence<> were broken for 1.3.2. 
+	  generatiom for sequence<> were broken for 1.3.2.
 
 	* performance-tests/Makefile:
 	* performance-tests/Makefile.bor: Added the new test directory
diff --git a/TAO/tao/Strategies/Makefile.bor b/TAO/tao/Strategies/Makefile.bor
index b22cfa44a16..db636403a4e 100644
--- a/TAO/tao/Strategies/Makefile.bor
+++ b/TAO/tao/Strategies/Makefile.bor
@@ -28,6 +28,15 @@ OBJFILES = \
 	$(OBJDIR)\DIOP_Connection_Handler.obj \
 	$(OBJDIR)\DIOP_Endpoint.obj \
 	$(OBJDIR)\uiop_endpoints.obj \
+   $(OBJDIR)\SCIOP_Acceptor.obj \
+   $(OBJDIR)\SCIOP_Connection_Handler.obj \
+   $(OBJDIR)\SCIOP_Connector.obj \
+   $(OBJDIR)\SCIOP_Endpoint.obj \
+   $(OBJDIR)\SCIOP_Factory.obj \
+   $(OBJDIR)\SCIOP_Lite_Factory.obj \
+   $(OBJDIR)\SCIOP_Profile.obj \
+   $(OBJDIR)\SCIOP_Transport.obj \
+   $(OBJDIR)\sciop_endpoints.obj \
 	$(OBJDIR)\advanced_resource.obj \
 	$(OBJDIR)\FIFO_Connection_Purging_Strategy.obj \
 	$(OBJDIR)\LFU_Connection_Purging_Strategy.obj \
diff --git a/TAO/tao/Strategies/SCIOP_Acceptor.h b/TAO/tao/Strategies/SCIOP_Acceptor.h
index 607c7c4c24e..8dc10d1e3d3 100644
--- a/TAO/tao/Strategies/SCIOP_Acceptor.h
+++ b/TAO/tao/Strategies/SCIOP_Acceptor.h
@@ -42,7 +42,7 @@
  *
  * The SCIOP-specific bridge class for the concrete acceptor.
  */
-class TAO_Export TAO_SCIOP_Acceptor : public TAO_Acceptor
+class TAO_Strategies_Export TAO_SCIOP_Acceptor : public TAO_Acceptor
 {
 public:
   /// Constructor.
diff --git a/TAO/tao/Strategies/SCIOP_Connection_Handler.h b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
index a54e7d1fa33..2d7b694793e 100644
--- a/TAO/tao/Strategies/SCIOP_Connection_Handler.h
+++ b/TAO/tao/Strategies/SCIOP_Connection_Handler.h
@@ -26,6 +26,7 @@
 
 #if TAO_HAS_SCIOP == 1
 
+#include "strategies_export.h"
 #include "tao/Connection_Handler.h"
 #include "tao/IIOPC.h"
 
@@ -38,7 +39,7 @@ typedef ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>
         TAO_SCIOP_SVC_HANDLER;
 
 #if defined ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT
-template class TAO_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>;
+template class TAO_Strategies_Export ACE_Svc_Handler<ACE_SOCK_SEQPACK_ASSOCIATION, ACE_NULL_SYNCH>;
 #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION_EXPORT */
 
 
@@ -57,7 +58,7 @@ class TAO_Pluggable_Messaging;
 
 #define IPDSFIELD_DSCP_DEFAULT  0x00
 
-class TAO_Export TAO_SCIOP_Properties
+class TAO_Strategies_Export TAO_SCIOP_Properties
 {
 
 public:
@@ -95,8 +96,8 @@ public:
  */
 
 
-class TAO_Export TAO_SCIOP_Connection_Handler : public TAO_SCIOP_SVC_HANDLER,
-                                               public TAO_Connection_Handler
+class TAO_Strategies_Export TAO_SCIOP_Connection_Handler : public TAO_SCIOP_SVC_HANDLER,
+                                                           public TAO_Connection_Handler
 {
 
 public:
diff --git a/TAO/tao/Strategies/SCIOP_Connector.h b/TAO/tao/Strategies/SCIOP_Connector.h
index 5a7710c13aa..fd78a06086f 100644
--- a/TAO/tao/Strategies/SCIOP_Connector.h
+++ b/TAO/tao/Strategies/SCIOP_Connector.h
@@ -45,7 +45,7 @@ class TAO_SCIOP_Endpoint;
  * for establishing a connection with a server and is called from the
  * Connector_Registory.
  */
-class TAO_Export TAO_SCIOP_Connector : public TAO_Connector
+class TAO_Strategies_Export TAO_SCIOP_Connector : public TAO_Connector
 {
 public:
   // = Initialization and termination methods.
diff --git a/TAO/tao/Strategies/SCIOP_Endpoint.h b/TAO/tao/Strategies/SCIOP_Endpoint.h
index 630dad8bdb0..b24a148f1a8 100644
--- a/TAO/tao/Strategies/SCIOP_Endpoint.h
+++ b/TAO/tao/Strategies/SCIOP_Endpoint.h
@@ -21,16 +21,16 @@
 
 #include "tao/Endpoint.h"
 
-#if TAO_HAS_SCIOP == 1
-
 #if !defined (ACE_LACKS_PRAGMA_ONCE)
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#if TAO_HAS_SCIOP == 1
+
+#include "strategies_export.h"
 #include "tao/CORBA_String.h"
 #include "ace/INET_Addr.h"
 
-
 class TAO_SCIOP_Connection_Handler;
 
 /**
@@ -40,7 +40,7 @@ class TAO_SCIOP_Connection_Handler;
  *
  * SCIOP-specific implementation of PP Framework Endpoint interface.
  */
-class TAO_Export TAO_SCIOP_Endpoint : public TAO_Endpoint
+class TAO_Strategies_Export TAO_SCIOP_Endpoint : public TAO_Endpoint
 {
 public:
 
diff --git a/TAO/tao/Strategies/SCIOP_Factory.h b/TAO/tao/Strategies/SCIOP_Factory.h
index 61630eae6f6..15fe5f4ce30 100644
--- a/TAO/tao/Strategies/SCIOP_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Factory.h
@@ -23,12 +23,13 @@
 
 #if TAO_HAS_SCIOP == 1
 
+#include "strategies_export.h"
 #include "ace/Service_Config.h"
 
 class TAO_Acceptor;
 class TAO_Connector;
 
-class TAO_Export TAO_SCIOP_Protocol_Factory : public TAO_Protocol_Factory
+class TAO_Strategies_Export TAO_SCIOP_Protocol_Factory : public TAO_Protocol_Factory
 {
 public:
   TAO_SCIOP_Protocol_Factory (void);
@@ -60,8 +61,8 @@ private:
   int minor_;
 };
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_SCIOP_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_SCIOP_Protocol_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Protocol_Factory)
+ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Protocol_Factory)
 
 
 #endif /* TAO_HAS_SCIOP == 1 */
diff --git a/TAO/tao/Strategies/SCIOP_Lite_Factory.h b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
index 03536d59935..e4ffb842167 100644
--- a/TAO/tao/Strategies/SCIOP_Lite_Factory.h
+++ b/TAO/tao/Strategies/SCIOP_Lite_Factory.h
@@ -23,12 +23,13 @@
 
 #if TAO_HAS_SCIOP == 1
 
+#include "strategies_export.h"
 #include "ace/Service_Config.h"
 
 class TAO_Acceptor;
 class TAO_Connector;
 
-class TAO_Export TAO_SCIOP_Lite_Protocol_Factory :
+class TAO_Strategies_Export TAO_SCIOP_Lite_Protocol_Factory :
   public TAO_Protocol_Factory
 {
 public:
@@ -62,8 +63,8 @@ private:
   int minor_;
 };
 
-ACE_STATIC_SVC_DECLARE_EXPORT (TAO, TAO_SCIOP_Lite_Protocol_Factory)
-ACE_FACTORY_DECLARE (TAO, TAO_SCIOP_Lite_Protocol_Factory)
+ACE_STATIC_SVC_DECLARE_EXPORT (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory)
+ACE_FACTORY_DECLARE (TAO_Strategies, TAO_SCIOP_Lite_Protocol_Factory)
 
 #endif /* TAO_HAS_SCIOP == 1 */
 
diff --git a/TAO/tao/Strategies/SCIOP_Profile.h b/TAO/tao/Strategies/SCIOP_Profile.h
index 72860f09e01..43f1928c3dc 100644
--- a/TAO/tao/Strategies/SCIOP_Profile.h
+++ b/TAO/tao/Strategies/SCIOP_Profile.h
@@ -35,7 +35,7 @@
  * This class defines the SCIOP profile as specified in the CORBA
  * specification.
  */
-class TAO_Export TAO_SCIOP_Profile : public TAO_Profile
+class TAO_Strategies_Export TAO_SCIOP_Profile : public TAO_Profile
 {
 public:
   /// The object key delimiter that SCIOP uses or expects.
diff --git a/TAO/tao/Strategies/SCIOP_Transport.h b/TAO/tao/Strategies/SCIOP_Transport.h
index 18b9531436d..fe3905ae174 100644
--- a/TAO/tao/Strategies/SCIOP_Transport.h
+++ b/TAO/tao/Strategies/SCIOP_Transport.h
@@ -23,6 +23,7 @@
 
 #if TAO_HAS_SCIOP == 1
 
+#include "strategies_export.h"
 #include "tao/IIOPC.h"
 #include "ace/SOCK_SEQPACK_Association.h"
 #include "ace/Synch.h"
@@ -43,7 +44,7 @@ class TAO_Acceptor;
  * Specialization of the base TAO_Transport class to handle the SCIOP
  * protocol.
  */
-class TAO_Export TAO_SCIOP_Transport : public TAO_Transport
+class TAO_Strategies_Export TAO_SCIOP_Transport : public TAO_Transport
 {
 public:
 
diff --git a/TAO/tao/Strategies/sciop_endpoints.h b/TAO/tao/Strategies/sciop_endpoints.h
index 2ce8a765254..1d826401812 100644
--- a/TAO/tao/Strategies/sciop_endpoints.h
+++ b/TAO/tao/Strategies/sciop_endpoints.h
@@ -17,6 +17,8 @@
 # pragma once
 #endif /* ACE_LACKS_PRAGMA_ONCE */
 
+#include "strategies_export.h"
+
 #include "tao/Managed_Types.h"
 #include "tao/Sequence.h"
 #include "tao/CDR.h"
@@ -25,13 +27,13 @@
 #if defined (TAO_EXPORT_MACRO)
 #undef TAO_EXPORT_MACRO
 #endif
-#define TAO_EXPORT_MACRO TAO_Export
+#define TAO_EXPORT_MACRO TAO_Strategies_Export
 
 #if defined (TAO_EXPORT_NESTED_CLASSES)
 #  if defined (TAO_EXPORT_NESTED_MACRO)
 #    undef TAO_EXPORT_NESTED_MACRO
 #  endif /* defined (TAO_EXPORT_NESTED_MACRO) */
-#  define TAO_EXPORT_NESTED_MACRO TAO_Export
+#  define TAO_EXPORT_NESTED_MACRO TAO_Strategies_Export
 #endif /* TAO_EXPORT_NESTED_CLASSES */
 
 #if defined(_MSC_VER)
@@ -44,7 +46,7 @@
 struct TAO_SCIOP_Endpoint_Info;
 class TAO_SCIOP_Endpoint_Info_var;
 
-struct TAO_Export TAO_SCIOP_Endpoint_Info
+struct TAO_Strategies_Export TAO_SCIOP_Endpoint_Info
 {
 
 #if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
@@ -58,7 +60,7 @@ struct TAO_Export TAO_SCIOP_Endpoint_Info
   CORBA::Short priority;
 };
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_TAO_SCIOP_Endpoint_Info;
+extern TAO_Strategies_Export CORBA::TypeCode_ptr  _tc_TAO_SCIOP_Endpoint_Info;
 
 
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -113,7 +115,7 @@ class TAO_SCIOPEndpointSequence_var;
 // TAO_SCIOPEndpointSequence
 // *************************************************************
 
-class TAO_Export TAO_SCIOPEndpointSequence : public
+class TAO_Strategies_Export TAO_SCIOPEndpointSequence : public
 #if !defined (TAO_USE_SEQUENCE_TEMPLATES)
   _TAO_Unbounded_Sequence_TAO_SCIOPEndpointSequence
 #else /* TAO_USE_SEQUENCE_TEMPLATES */
@@ -149,7 +151,7 @@ public:
 // class TAO_SCIOPEndpointSequence_var
 // *************************************************************
 
-class TAO_Export TAO_SCIOPEndpointSequence_var
+class TAO_Strategies_Export TAO_SCIOPEndpointSequence_var
 {
 public:
   TAO_SCIOPEndpointSequence_var (void); // default constructor
@@ -183,21 +185,21 @@ private:
 #endif /* end #if !defined */
 
 
-extern TAO_Export CORBA::TypeCode_ptr  _tc_TAO_SCIOPEndpointSequence;
+extern TAO_Strategies_Export CORBA::TypeCode_ptr  _tc_TAO_SCIOPEndpointSequence;
 
 #ifndef __ACE_INLINE__
 
-TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_SCIOP_Endpoint_Info &);
-TAO_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_SCIOP_Endpoint_Info &);
+TAO_Strategies_Export CORBA::Boolean operator<< (TAO_OutputCDR &, const TAO_SCIOP_Endpoint_Info &);
+TAO_Strategies_Export CORBA::Boolean operator>> (TAO_InputCDR &, TAO_SCIOP_Endpoint_Info &);
 
 #if !defined _TAO_CDR_OP_TAO_SCIOPEndpointSequence_H_
 #define _TAO_CDR_OP_TAO_SCIOPEndpointSequence_H_
 
-TAO_Export CORBA::Boolean operator<< (
+TAO_Strategies_Export CORBA::Boolean operator<< (
     TAO_OutputCDR &,
     const TAO_SCIOPEndpointSequence &
   );
-TAO_Export CORBA::Boolean operator>> (
+TAO_Strategies_Export CORBA::Boolean operator>> (
     TAO_InputCDR &,
     TAO_SCIOPEndpointSequence &
   );