ChangeLogTag:Thu Feb 08 12:08:09 2002 Balachandran Natarajan <bala@cs.wustl.edu>

10 files changed, 66 insertions, 16 deletions

diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index a449a9d016d..f26bf91a408 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -20,6 +20,7 @@
 #include "ace/Sched_Params.h"
 #include "orbsvcs/CosNamingC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
+#include "activity_export.h"
 
 class ACE_Barrier;
 class Job_i;
@@ -33,7 +34,7 @@ class Builder;
  * generating activity in this process.
  *
  */
-class Activity
+class activity_Export Activity
 {
   friend class ACE_Singleton<Activity, ACE_Null_Mutex>;
 
diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index afd5543555a..7ef5a89da40 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -135,7 +135,6 @@ Builder::job_list (JOB_LIST& job_list)
   return job_count_;
 }
 
-ACE_SVC_FACTORY_DEFINE (Builder)
 
 ACE_STATIC_SVC_DEFINE(Builder,
                       ACE_TEXT ("Builder"),
@@ -143,3 +142,5 @@ ACE_STATIC_SVC_DEFINE(Builder,
                       &ACE_SVC_NAME (Builder),
                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                       0)
+
+ACE_FACTORY_DEFINE (activity, Builder)
diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h
index eb4c49d6f8c..5b333145f0b 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -22,6 +22,7 @@ class POA_Holder;
 
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
+#include "activity_export.h"
 
 class Activity;
 class ACE_Arg_Shifter;
@@ -36,7 +37,7 @@ typedef Job_i** JOB_LIST;
  * @brief A service object that creates Tasks, Jobs, POAs.
  *
  */
-class Builder : public ACE_Service_Object
+class activity_Export Builder : public ACE_Service_Object
 {
  public:
   /// = Initialization and termination
@@ -73,8 +74,8 @@ class Builder : public ACE_Service_Object
   JOB_LIST job_list_;
 };
 
-ACE_STATIC_SVC_DECLARE (Builder)
+ACE_STATIC_SVC_DECLARE_EXPORT (activity, Builder)
 
-ACE_SVC_FACTORY_DECLARE (Builder)
+ACE_FACTORY_DECLARE (activity, Builder)
 
 #endif /* BUILDER_H */
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index c8645d2c054..3426fda03df 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -14,6 +14,7 @@
 #define JOB_I_H
 
 #include "JobS.h"
+#include "activity_export.h"
 
 class ACE_Arg_Shifter;
 
@@ -23,7 +24,7 @@ class ACE_Arg_Shifter;
  * @brief Implements a Job that performs some cpu bound work.
  *
  */
-class Job_i : public POA_Job, public virtual PortableServer::RefCountServantBase
+class activity_Export Job_i : public POA_Job, public virtual PortableServer::RefCountServantBase
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index d0cb57630dd..eb649acc8c4 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -15,6 +15,7 @@
 
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServer.h"
+#include "activity_export.h"
 
 class ACE_Arg_Shifter;
 
@@ -24,7 +25,7 @@ class ACE_Arg_Shifter;
  * @brief An options holder for parameters to creating a poa.
  *
  */
-class POA_Holder
+class activity_Export POA_Holder
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index a8639777508..0c82ad4b87c 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -16,6 +16,7 @@
 #include "tao/RTCORBA/RTCORBA.h"
 #include "ace/Task.h"
 #include "JobC.h"
+#include "activity_export.h"
 
 class ACE_Barrier;
 class ACE_Arg_Shifter;
@@ -27,7 +28,7 @@ class Task_Stats;
  * @brief Periodic_Task executes jobs.
  *
  */
-class Periodic_Task : public ACE_Task <ACE_SYNCH>
+class activity_Export Periodic_Task : public ACE_Task <ACE_SYNCH>
 {
  public:
   /// = Initialization and termination code.
diff --git a/TAO/examples/RTCORBA/Activity/Task_Stats.h b/TAO/examples/RTCORBA/Activity/Task_Stats.h
index 305742862a5..a2e26ae21f7 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.h
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h
@@ -17,6 +17,7 @@
 #include "ace/Singleton.h"
 #include "tao/orbconf.h"
 #include "tao/debug.h"
+#include "activity_export.h"
 
 /**
  * @class Base_Time
@@ -24,7 +25,7 @@
  * @brief maintains readings recorded by tasks.
  *
  */
-class Base_Time
+class activity_Export Base_Time
 {
  public:
   Base_Time (void);
@@ -39,7 +40,7 @@ typedef ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX> BASE_TIME;
  * @brief maintains readings recorded by tasks.
  *
  */
-class Task_Stats
+class activity_Export Task_Stats
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h
index 3e7db446563..e1d470d7753 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h
@@ -27,7 +27,7 @@
  * overlapped period(s) are considered "missed".
  *
  */
-class Thread_Task : public Periodic_Task
+class activity_Export Thread_Task : public Periodic_Task
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTCORBA/Activity/activity.dsp b/TAO/examples/RTCORBA/Activity/activity.dsp
index a470729b429..5aed7689fc4 100644
--- a/TAO/examples/RTCORBA/Activity/activity.dsp
+++ b/TAO/examples/RTCORBA/Activity/activity.dsp
@@ -41,8 +41,8 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "ACTIVITY_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /D "ACTIVITY_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "NDEBUG"

 # ADD RSC /l 0x409 /d "NDEBUG"

@@ -51,7 +51,8 @@ BSC32=bscmake.exe
 # ADD BSC32 /nologo

 LINK32=link.exe

 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 ace.lib TAO.lib TAO_PortableActivity.lib TAO_RTCORBA.lib TAO_RTPortableActivity.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableActivity" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableActivity"

+# ADD LINK32 ace.lib TAO.lib TAO_PortableServer.lib TAO_RTCORBA.lib TAO_RTPortableServer.lib TAO_CosNaming.lib /nologo /subsystem:console /machine:I386 /libpath:"..\..\..\..\ace" /libpath:"..\..\..\tao" /libpath:"..\..\..\tao\PortableServer" /libpath:"..\..\..\tao\RTCORBA" /libpath:"..\..\..\tao\RTPortableServer" /libpath:"..\..\..\orbsvcs\orbsvcs"

+# SUBTRACT LINK32 /pdb:none

 

 !ELSEIF  "$(CFG)" == " Activity - Win32 Debug"

 

@@ -66,8 +67,8 @@ LINK32=link.exe
 # PROP Intermediate_Dir "Debug"

 # PROP Ignore_Export_Lib 0

 # PROP Target_Dir ""

-# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# ADD BASE CPP /nologo /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ACTIVITY_BUILD_DLL" /YX /FD /c

+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\\" /I "..\..\..\\" /I "..\..\..\..\\" /I "..\..\..\orbsvcs" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /D "ACTIVITY_BUILD_DLL" /FD /c

 # SUBTRACT CPP /YX

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

 # ADD RSC /l 0x409 /d "_DEBUG"

@@ -133,6 +134,10 @@ SOURCE=.\Activity.h
 # End Source File

 # Begin Source File

 

+SOURCE=.\activity_export.h

+# End Source File

+# Begin Source File

+

 SOURCE=.\Builder.h

 # End Source File

 # Begin Source File

diff --git a/TAO/examples/RTCORBA/Activity/activity_export.h b/TAO/examples/RTCORBA/Activity/activity_export.h
new file mode 100644
index 00000000000..a33eec53a40
--- /dev/null
+++ b/TAO/examples/RTCORBA/Activity/activity_export.h
@@ -0,0 +1,38 @@
+
+// -*- C++ -*-
+// $Id$
+// Definition for Win32 Export directives.
+// This file is generated automatically by generate_export_file.pl
+// ------------------------------
+#ifndef ACTIVITY_EXPORT_H
+#define ACTIVITY_EXPORT_H
+
+#include "ace/config-all.h"
+
+#if defined (ACE_AS_STATIC_LIBS) && !defined (ACTIVITY_HAS_DLL)
+#  define ACTIVITY_HAS_DLL 0
+#endif /* ACE_AS_STATIC_LIBS && ACTIVITY_HAS_DLL */
+
+#if !defined (ACTIVITY_HAS_DLL)
+#  define ACTIVITY_HAS_DLL 1
+#endif /* ! ACTIVITY_HAS_DLL */
+
+#if defined (ACTIVITY_HAS_DLL) && (ACTIVITY_HAS_DLL == 1)
+#  if defined (ACTIVITY_BUILD_DLL)
+#    define activity_Export ACE_Proper_Export_Flag
+#    define ACTIVITY_SINGLETON_DECLARATION(T) ACE_EXPORT_SINGLETON_DECLARATION (T)
+#    define ACTIVITY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_EXPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  else /* ACTIVITY_BUILD_DLL */
+#    define activity_Export ACE_Proper_Import_Flag
+#    define ACTIVITY_SINGLETON_DECLARATION(T) ACE_IMPORT_SINGLETON_DECLARATION (T)
+#    define ACTIVITY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK) ACE_IMPORT_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#  endif /* ACTIVITY_BUILD_DLL */
+#else /* ACTIVITY_HAS_DLL == 1 */
+#  define activity_Export
+#  define ACTIVITY_SINGLETON_DECLARATION(T)
+#  define ACTIVITY_SINGLETON_DECLARE(SINGLETON_TYPE, CLASS, LOCK)
+#endif /* ACTIVITY_HAS_DLL == 1 */
+
+#endif /* ACTIVITY_EXPORT_H */
+
+// End of auto generated file.