Merge pull request #469 from jwillemsen/jwi-rtcorba-activity

Fixed linking of RTCORBA Activity example with bcc32

10 files changed, 12 insertions, 57 deletions

diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index e8a26396e0a..8f8ffa04ee2 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -19,7 +19,6 @@
 #include "orbsvcs/CosNamingC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 #include "tao/RTCORBA/Priority_Mapping_Manager.h"
-#include "activity_export.h"
 #include "ace/Null_Mutex.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
@@ -36,7 +35,7 @@ class Builder;
  * @brief Driver class that maintains the orb and collections of objects for
  * generating activity in this process.
  */
-class activity_Export Activity
+class Activity
 {
   friend class ACE_Singleton<Activity, ACE_Null_Mutex>;
 
diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc
index e85ed290b83..2a8c540f1cf 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.mpc
+++ b/TAO/examples/RTCORBA/Activity/Activity.mpc
@@ -1,9 +1,7 @@
 // -*- MPC -*-
 project : orbsvcslib, namingexe, rt_server {
   exename = activity
-  // We use macros instead of dynamicflags so that 
-  // the symbols will be exported from an exe. 
-  macros += ACTIVITY_BUILD_DLL
+
   Source_Files {
     Activity.cpp
     Builder.cpp
diff --git a/TAO/examples/RTCORBA/Activity/Builder.cpp b/TAO/examples/RTCORBA/Activity/Builder.cpp
index 948a153400b..820c9b284f1 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.cpp
+++ b/TAO/examples/RTCORBA/Activity/Builder.cpp
@@ -181,4 +181,4 @@ ACE_STATIC_SVC_DEFINE(Builder,
                       ACE_Service_Type::DELETE_THIS | ACE_Service_Type::DELETE_OBJ,
                       0)
 
-ACE_FACTORY_DEFINE (activity, Builder)
+ACE_FACTORY_DEFINE (ACE_Local_Service, Builder)
diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h
index 201e5d73a7b..e72773572cf 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -17,7 +17,6 @@
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 #include "ace/Arg_Shifter.h"
-#include "activity_export.h"
 
 class Activity;
 class Periodic_Task;
@@ -33,7 +32,7 @@ typedef Job_i** JOB_LIST;
  *
  * @brief A service object that creates Tasks, Jobs, POAs.
  */
-class activity_Export Builder : public ACE_Service_Object
+class Builder : public ACE_Service_Object
 {
  public:
   /// = Initialization and termination
@@ -70,8 +69,8 @@ class activity_Export Builder : public ACE_Service_Object
   JOB_LIST job_list_;
 };
 
-ACE_STATIC_SVC_DECLARE_EXPORT (activity, Builder)
+ACE_STATIC_SVC_DECLARE (Builder)
 
-ACE_FACTORY_DECLARE (activity, Builder)
+ACE_FACTORY_DECLARE (ACE_Local_Service, Builder)
 
 #endif /* BUILDER_H */
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index 8e66af9d845..7eda03d5f40 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -12,7 +12,6 @@
 #define JOB_I_H
 
 #include "JobS.h"
-#include "activity_export.h"
 #include "ace/SString.h"
 #include "ace/Arg_Shifter.h"
 
@@ -21,7 +20,7 @@
  *
  * @brief Implements a Job that performs some cpu bound work.
  */
-class activity_Export Job_i : public POA_Job
+class Job_i : public POA_Job
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index adcaccb5aa9..2e8440ba572 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -13,7 +13,6 @@
 
 #include "tao/RTCORBA/RTCORBA.h"
 #include "tao/PortableServer/PortableServer.h"
-#include "activity_export.h"
 #include "ace/SString.h"
 #include "ace/Arg_Shifter.h"
 
@@ -22,7 +21,7 @@
  *
  * @brief An options holder for parameters to creating a poa.
  */
-class activity_Export POA_Holder
+class POA_Holder
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index c1a7eed9dd3..58dd9d15e7b 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -17,7 +17,6 @@
 #include "ace/SString.h"
 #include "ace/Arg_Shifter.h"
 #include "JobC.h"
-#include "activity_export.h"
 
 ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
@@ -30,7 +29,7 @@ class Task_Stats;
  *
  * @brief Periodic_Task executes jobs.
  */
-class activity_Export Periodic_Task : public ACE_Task <ACE_SYNCH>
+class 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 7d8d5ca8556..235a40dc7c9 100644
--- a/TAO/examples/RTCORBA/Activity/Task_Stats.h
+++ b/TAO/examples/RTCORBA/Activity/Task_Stats.h
@@ -15,7 +15,6 @@
 #include "ace/Singleton.h"
 #include "tao/orbconf.h"
 #include "tao/debug.h"
-#include "activity_export.h"
 #include "ace/High_Res_Timer.h"
 
 /**
@@ -23,7 +22,7 @@
  *
  * @brief maintains readings recorded by tasks.
  */
-class activity_Export Base_Time
+class Base_Time
 {
  public:
   Base_Time (void);
@@ -37,7 +36,7 @@ typedef ACE_Singleton<Base_Time, TAO_SYNCH_MUTEX> BASE_TIME;
  *
  * @brief maintains readings recorded by tasks.
  */
-class activity_Export Task_Stats
+class Task_Stats
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTCORBA/Activity/Thread_Task.h b/TAO/examples/RTCORBA/Activity/Thread_Task.h
index a6d8d45a3ad..13563a579f6 100644
--- a/TAO/examples/RTCORBA/Activity/Thread_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Thread_Task.h
@@ -24,7 +24,7 @@
  * if <exec_time_> is greater than the <period_>, the activity(s) for the
  * overlapped period(s) are considered "missed".
  */
-class activity_Export Thread_Task : public Periodic_Task
+class Thread_Task : public Periodic_Task
 {
  public:
   /// Constructor
diff --git a/TAO/examples/RTCORBA/Activity/activity_export.h b/TAO/examples/RTCORBA/Activity/activity_export.h
deleted file mode 100644
index e1f4c003eb8..00000000000
--- a/TAO/examples/RTCORBA/Activity/activity_export.h
+++ /dev/null
@@ -1,37 +0,0 @@
-
-// -*- C++ -*-
-// 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.