diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2021-11-12 14:32:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-12 14:32:31 +0100 |
| commit | 584e5e58c66253018a145f40d966d2fa7b01c382 (patch) | |
| tree | fe11f5757b6cda6d6ef782bd76b661d5b6be4c8a /TAO/orbsvcs/orbsvcs/Notify/MonitorControl | |
| parent | 78e31e35bbc7d1ddc288b26d257f606af978655e (diff) | |
| parent | bf06d65f6dd1780bde5fcfc8fba852fb17234603 (diff) | |
| download | ATCD-584e5e58c66253018a145f40d966d2fa7b01c382.tar.gz | |
Merge pull request #1729 from jwillemsen/jwi-orbsvcsinclude
Installed tree doesn't have double orbvsvcs path
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Notify/MonitorControl')
5 files changed, 6 insertions, 6 deletions
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; |