Thu Dec 1 12:08:17 2005 Chris Cleeland <cleeland_c@ociweb.com>

Scoreboard fixes for OS X Tiger and BC6 builds.

5 files changed, 13 insertions, 6 deletions

diff --git a/TAO/orbsvcs/orbsvcs/Notify/Object.h b/TAO/orbsvcs/orbsvcs/Notify/Object.h
index 07ec0156f51..29a673c8aad 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Object.h
@@ -26,6 +26,7 @@
 #include "Worker_Task.h"
 #include "Refcountable.h"
 #include "Name_Value_Pair.h"
+#include "Event_Manager.h"
 
 #include "orbsvcs/NotifyExtC.h"
 
@@ -36,7 +37,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 class TAO_Notify_POA_Helper;
 class TAO_Notify_Timer;
 class TAO_Notify_RT_Builder;
-class TAO_Notify_Event_Manager;
 
 /**
  * @class TAO_Notify_Object
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
index a825e209bc4..4ee5c51ac00 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.cpp
@@ -23,6 +23,11 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
+  const char REGISTRY_TYPE[] = "reconnect_registry";
+  const char RECONNECT_ID[] = "ReconnectId";
+  const char RECONNECT_IOR[] = "IOR";
+  const char REGISTRY_CALLBACK_TYPE[] = "reconnect_callback";
+
   Reconnection_Registry::Reconnection_Registry (Topology_Parent & parent)
     : highest_id_(0)
   {
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
index a55eb6973c6..846e0dea054 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Reconnection_Registry.h
@@ -28,10 +28,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
-  static const char REGISTRY_TYPE[] = "reconnect_registry";
-  static const char RECONNECT_ID[] = "ReconnectId";
-  static const char RECONNECT_IOR[] = "IOR";
-  static const char REGISTRY_CALLBACK_TYPE[] = "reconnect_callback";
+  extern const char REGISTRY_TYPE[];
+  extern const char RECONNECT_ID[];
+  extern const char RECONNECT_IOR[];
+  extern const char REGISTRY_CALLBACK_TYPE[];
 
   /**
    * @class Reconnection_Registry
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
index f6067d94863..8e4093f74eb 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp
@@ -17,6 +17,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO_Notify
 {
+  const char TOPOLOGY_ID_NAME[] = "TopologyID";
+
   Topology_Savable::~Topology_Savable (void)
   {
   }
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
index 333a65a460f..6dbfdf0cebd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.h
@@ -46,7 +46,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 //
 namespace TAO_Notify
 {
-  static const char TOPOLOGY_ID_NAME[] = "TopologyID";
+  extern const char TOPOLOGY_ID_NAME[];
 
   class Topology_Saver;
   class Topology_Parent;