ChangeLogTag:Thu Dec 8 16:37:06 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

10 files changed, 45 insertions, 6 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 634fd39c97b..7ef33dc1188 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,22 @@
+Thu Dec  8 16:37:06 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
+
+	* examples/RTCORBA/Activity/Activity.mpc:
+
+	  Do override "macros" variable.  Add to it instead.  Fixes
+	  problem where versioned namespace preprocessor symbols were not
+	  added to generated Makefiles/projects.
+
+	* examples/RTCORBA/Activity/Activity.h:
+	* examples/RTCORBA/Activity/Builder.h:
+	* examples/RTCORBA/Activity/Job_i.h:
+	* examples/RTCORBA/Activity/POA_Holder.h:
+	* examples/RTCORBA/Activity/Periodic_Task.h:
+	* examples/RTScheduling/Job_i.h:
+	* examples/RTScheduling/POA_Holder.h:
+	* examples/Simple/bank/AccountManager_i.h:
+
+	  Fixed versioned namespace support.
+
 Thu Dec  8 14:19:52 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 
 	* orbsvcs/orbsvcs/CosEvent/CEC_Dispatching_Task.h:
diff --git a/TAO/examples/RTCORBA/Activity/Activity.h b/TAO/examples/RTCORBA/Activity/Activity.h
index ea5cef35093..346b2c6a414 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.h
+++ b/TAO/examples/RTCORBA/Activity/Activity.h
@@ -24,7 +24,10 @@
 #include "activity_export.h"
 #include "ace/Null_Mutex.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class Job_i;
 class Periodic_Task;
 class Builder;
diff --git a/TAO/examples/RTCORBA/Activity/Activity.mpc b/TAO/examples/RTCORBA/Activity/Activity.mpc
index ef8cc8a0296..0d7054ff5b0 100644
--- a/TAO/examples/RTCORBA/Activity/Activity.mpc
+++ b/TAO/examples/RTCORBA/Activity/Activity.mpc
@@ -5,7 +5,7 @@ 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
+  macros += ACTIVITY_BUILD_DLL
   Source_Files {
     Activity.cpp
     Builder.cpp
diff --git a/TAO/examples/RTCORBA/Activity/Builder.h b/TAO/examples/RTCORBA/Activity/Builder.h
index 5b333145f0b..20c001a4989 100644
--- a/TAO/examples/RTCORBA/Activity/Builder.h
+++ b/TAO/examples/RTCORBA/Activity/Builder.h
@@ -16,16 +16,19 @@
 #include "orbsvcs/CosNamingC.h"
 #include "tao/RTPortableServer/RTPortableServer.h"
 
-class Periodic_Task;
-class Job_i;
-class POA_Holder;
-
 #include "ace/Service_Config.h"
 #include "ace/Service_Object.h"
 #include "activity_export.h"
 
-class Activity;
+
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Arg_Shifter;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
+class Activity;
+class Periodic_Task;
+class Job_i;
+class POA_Holder;
 
 typedef POA_Holder** POA_LIST;
 typedef Periodic_Task** TASK_LIST;
diff --git a/TAO/examples/RTCORBA/Activity/Job_i.h b/TAO/examples/RTCORBA/Activity/Job_i.h
index 563abde30ed..8ca42bb86b5 100644
--- a/TAO/examples/RTCORBA/Activity/Job_i.h
+++ b/TAO/examples/RTCORBA/Activity/Job_i.h
@@ -17,7 +17,9 @@
 #include "activity_export.h"
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Arg_Shifter;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class Job_i
diff --git a/TAO/examples/RTCORBA/Activity/POA_Holder.h b/TAO/examples/RTCORBA/Activity/POA_Holder.h
index 81a850a323c..3c056a88fba 100644
--- a/TAO/examples/RTCORBA/Activity/POA_Holder.h
+++ b/TAO/examples/RTCORBA/Activity/POA_Holder.h
@@ -18,7 +18,9 @@
 #include "activity_export.h"
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Arg_Shifter;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class POA_Holder
diff --git a/TAO/examples/RTCORBA/Activity/Periodic_Task.h b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
index 6fb89649ab3..ca4c822eeff 100644
--- a/TAO/examples/RTCORBA/Activity/Periodic_Task.h
+++ b/TAO/examples/RTCORBA/Activity/Periodic_Task.h
@@ -20,8 +20,11 @@
 #include "JobC.h"
 #include "activity_export.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Barrier;
 class ACE_Arg_Shifter;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class Task_Stats;
 
 /**
diff --git a/TAO/examples/RTScheduling/Job_i.h b/TAO/examples/RTScheduling/Job_i.h
index 7aa0756f128..3aaf9bf3e1b 100644
--- a/TAO/examples/RTScheduling/Job_i.h
+++ b/TAO/examples/RTScheduling/Job_i.h
@@ -17,7 +17,10 @@
 #include "Task_Stats.h"
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Arg_Shifter;
+ACE_END_VERSIONED_NAMESPACE_DECL
+
 class DT_Creator;
 
 /**
diff --git a/TAO/examples/RTScheduling/POA_Holder.h b/TAO/examples/RTScheduling/POA_Holder.h
index d92dabfe616..28adbd31a18 100644
--- a/TAO/examples/RTScheduling/POA_Holder.h
+++ b/TAO/examples/RTScheduling/POA_Holder.h
@@ -20,7 +20,9 @@
 //#include "activity_export.h"
 #include "ace/SString.h"
 
+ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Arg_Shifter;
+ACE_END_VERSIONED_NAMESPACE_DECL
 
 /**
  * @class POA_Holder
diff --git a/TAO/examples/Simple/bank/AccountManager_i.h b/TAO/examples/Simple/bank/AccountManager_i.h
index 21321e449c3..ebae834858d 100644
--- a/TAO/examples/Simple/bank/AccountManager_i.h
+++ b/TAO/examples/Simple/bank/AccountManager_i.h
@@ -34,7 +34,9 @@
 #include "ace/SString.h"
 #include "ace/Null_Mutex.h"
 
+TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_ORB_Manager;
+TAO_END_VERSIONED_NAMESPACE_DECL
 
 class AccountManager_i : public POA_Bank::AccountManager
 {