diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs')
7 files changed, 8 insertions, 10 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h index e1833019aaa..1902a6b572b 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Persistent_Naming_Context.h @@ -8,14 +8,13 @@ */ //============================================================================= - #ifndef TAO_FT_PERSISTENT_NAMING_CONTEXT_H #define TAO_FT_PERSISTENT_NAMING_CONTEXT_H #include /**/ "ace/pre.h" #include "orbsvcs/Naming/Persistent_Naming_Context.h" #include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h index af00704fb9b..0bd6ff8862e 100644 --- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h +++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Storable_Naming_Context.h @@ -9,14 +9,13 @@ */ //============================================================================= - #ifndef TAO_FT_STORABLE_NAMING_CONTEXT_H #define TAO_FT_STORABLE_NAMING_CONTEXT_H #include /**/ "ace/pre.h" #include "orbsvcs/Naming/Storable_Naming_Context.h" #include "orbsvcs/Naming/FaultTolerant/ftnaming_export.h" -#include "orbsvcs/orbsvcs/PortableGroupC.h" +#include "orbsvcs/PortableGroupC.h" #include "orbsvcs/Naming/FaultTolerant/FT_Naming_Manager.h" #include "orbsvcs/FT_NamingReplicationC.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp index 7ff8ac5455d..f115e8dae29 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control.h" +#include "orbsvcs/Notify/MonitorControl/Control.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h index 71b48b13451..23d3eeadc0a 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h @@ -7,7 +7,7 @@ #include "tao/Monitor/Monitor.h" -#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control.h" +#include "orbsvcs/Notify/MonitorControl/Control.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp index e5ca866f620..d8806831e2e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.cpp @@ -1,6 +1,6 @@ #include "orbsvcs/Log_Macros.h" #include "orbsvcs/Log_Macros.h" -#include "orbsvcs/orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h" +#include "orbsvcs/Notify/MonitorControl/NotificationServiceMonitor_i.h" #include "tao/Monitor/Monitor_Impl.h" #include "ace/Auto_Ptr.h" @@ -9,7 +9,7 @@ #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) -#include "orbsvcs/orbsvcs/Notify/MonitorControl/Control_Registry.h" +#include "orbsvcs/Notify/MonitorControl/Control_Registry.h" using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp index 348dedc6c8d..0ff57ebd2e4 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.cpp @@ -1,4 +1,4 @@ -#include "orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h" +#include "orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h" #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) diff --git a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h index b93e4150e2a..7c091ba5e10 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/Notify/MonitorControl/Timestamp_Monitor.h @@ -14,7 +14,7 @@ #if defined (TAO_HAS_MONITOR_FRAMEWORK) && (TAO_HAS_MONITOR_FRAMEWORK == 1) -#include "orbsvcs/orbsvcs/Notify/MonitorControl/notify_mc_export.h" +#include "orbsvcs/Notify/MonitorControl/notify_mc_export.h" using namespace ACE_VERSIONED_NAMESPACE_NAME::ACE::Monitor_Control; |