diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/LoadBalancing')
31 files changed, 61 insertions, 86 deletions
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index 3032e0d46e6..a7c6b501515 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -4,11 +4,10 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" -#include "ace/os_include/sys/os_pstat.h" -#include "ace/os_include/sys/os_loadavg.h" -#if defined(__NetBSD__) -#include <sys/sysctl.h> -#endif + +#if defined (ACE_HAS_SYS_LOADAVG_H) +# include <sys/loadavg.h> +#endif /* ACE_HAS_SYS_LOADAVG_H */ ACE_RCSID (LoadBalancing, LB_CPU_Load_Average_Monitor, @@ -162,33 +161,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) else ACE_THROW_RETURN (CORBA::TRANSIENT (), 0); // Correct exception? -#elif defined (__NetBSD__) - - double loadavg[1]; - - const int samples = ::getloadavg (loadavg, 1); - - if (samples == 1) - { - int mib[2], num_processors; - size_t len; - - mib[0] = CTL_HW; - mib[1] = HW_NCPU; - len = sizeof(num_processors); - - sysctl(mib, 2, &num_processors, &len, NULL, 0); - - ACE_ASSERT (num_processors > 0); - - if (num_processors > 0) - load = loadavg[0] / num_processors; - else - ACE_THROW_RETURN (CORBA::TRANSIENT (), 0); // Correct exception? - } - else - ACE_THROW_RETURN (CORBA::TRANSIENT (), 0); // Correct exception? - #elif defined (hpux) struct pst_dynamic psd; @@ -209,7 +181,7 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) #endif -#if defined (WINDOWS) || defined (linux) || defined (sun) || defined (hpux) || defined(__NetBSD__) +#if defined (WINDOWS) || defined (linux) || defined (sun) || defined (hpux) CosLoadBalancing::LoadList * tmp; ACE_NEW_THROW_EX (tmp, @@ -235,6 +207,6 @@ TAO_LB_CPU_Load_Average_Monitor::loads (ACE_ENV_SINGLE_ARG_DECL) ACE_UNUSED_ARG (load); ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), 0); -#endif /* WINDOWS || linux || sun || hpux || __NetBSD__ */ +#endif /* WINDOWS || linux || sun || hpux */ } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h index ce0e3b6e62c..d680e65932a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index ec895f1af36..e639d21a88b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -4,7 +4,10 @@ #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" #include "ace/os_include/os_netdb.h" -#include "ace/os_include/sys/os_loadavg.h" + +#if defined (ACE_HAS_SYS_LOADAVG_H) +# include <sys/loadavg.h> +#endif /* ACE_HAS_SYS_LOADAVG_H */ ACE_RCSID (LoadBalancing, LB_CPU_Utilization_Monitor, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h index 6ad66ee8ada..fab93d1af5f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.h @@ -17,13 +17,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index 4d960d74884..224294591bc 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LB_ORTC.h" +#include "orbsvcs/orbsvcs/LB_ORTC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index fd3240d0bcd..374198c8aac 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -1,6 +1,6 @@ #include "LB_ClientRequestInterceptor.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" ACE_RCSID (LoadBalancing, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h index 0f290d8412b..166d3037734 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.h @@ -15,13 +15,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LB_ORTC.h" +#include "orbsvcs/orbsvcs/LB_ORTC.h" #include "ace/Service_Object.h" #include "ace/Service_Config.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index 7252318027a..537a3dcbdaf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -19,7 +19,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #include "tao/LocalObject.h" #include "tao/IORInterceptor/IORInterceptorC.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 11c0c402b90..97b11bfb4df 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -2,7 +2,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index 478b6d22b63..0ae1886cd3b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -22,7 +22,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index 5c356ef3b41..bec59e2725f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" class TAO_LoadBalancing_Export TAO_LB_LoadAlert diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index 78eeeb187f6..8b4effbc06d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -1,5 +1,5 @@ #include "LB_LoadAlertInfo.h" -#include "orbsvcs/PortableGroup/PG_Operators.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Operators.h" ACE_RCSID (LoadBalancing, LB_LoadAlertInfo, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h index 6736448e92c..069c924c021 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h @@ -22,7 +22,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" /** diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h index 620ec2d3acb..de57de3dc2a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertMap.h @@ -24,8 +24,8 @@ #include "LB_LoadAlertInfo.h" -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index 0768f411ac2..00ca3154c3d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -13,7 +13,7 @@ #ifndef TAO_LB_LOAD_ALERT_REPLY_HANDLER_H #define TAO_LB_LOAD_ALERT_REPLY_HANDLER_H -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index a9865acf8b7..d6da83152c8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -2,7 +2,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h index fc69de65e4a..8f50a617e19 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.h @@ -23,7 +23,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h index ebfbb3b6cb7..1ca35de22bf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadListMap.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 32d63b54f0f..e70d2ef5c7c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -8,8 +8,8 @@ #include "LB_LeastLoaded.h" #include "LB_conf.h" -#include "orbsvcs/PortableGroup/PG_Property_Utils.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Property_Utils.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/Messaging/Messaging.h" #include "tao/debug.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h index 06b190c4e4b..fc9477c0cb2 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once @@ -28,11 +28,11 @@ #include "LB_LoadListMap.h" #include "LB_Pull_Handler.h" -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" -#include "orbsvcs/PortableGroup/PG_PropertyManager.h" -#include "orbsvcs/PortableGroup/PG_GenericFactory.h" -#include "orbsvcs/PortableGroup/PG_ObjectGroupManager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_PropertyManager.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_GenericFactory.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.h" class TAO_LoadBalancing_Export TAO_LB_LoadManager diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h index 6e5778f4a55..1ff00d58bc6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMap.h @@ -16,16 +16,16 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 8f0cc83f219..a247293b071 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -3,7 +3,7 @@ #include "LB_LoadMap.h" #include "LB_Random.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index 522d574ea3c..1587d889b3f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -23,7 +23,7 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" #include "ace/Synch_Traits.h" #include "ace/Thread_Mutex.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h index b99c5437779..9bda59cc806 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h @@ -16,13 +16,13 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroupC.h" +#include "orbsvcs/orbsvcs/PortableGroupC.h" #include "ace/Functor.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h index 02b8f12adeb..46dd23539e5 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_MonitorMap.h @@ -16,14 +16,14 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/PortableGroup/PG_Location_Hash.h" -#include "orbsvcs/PortableGroup/PG_Location_Equal_To.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Hash.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_Location_Equal_To.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp index 245fc0552b1..9f59c099b0f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ORBInitializer.cpp @@ -2,7 +2,7 @@ #include "LB_IORInterceptor.h" #include "LB_ServerRequestInterceptor.h" -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h index d7bab7a8e98..6ca2b5b8597 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.h @@ -15,7 +15,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/LB_ORTC.h" +#include "orbsvcs/orbsvcs/LB_ORTC.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once @@ -28,7 +28,7 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ -#include "orbsvcs/CosLoadBalancingC.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingC.h" #include "ace/Array_Base.h" #include "ace/Hash_Map_Manager_T.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h index 2f03027c78a..7eb9eb88c72 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.h @@ -16,7 +16,7 @@ #include /**/ "ace/pre.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" # if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index 6e8c1db4288..82e408654ff 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -2,7 +2,7 @@ #include "LB_RoundRobin.h" -#include "orbsvcs/PortableGroup/PG_conf.h" +#include "orbsvcs/orbsvcs/PortableGroup/PG_conf.h" #include "tao/debug.h" #include "tao/ORB_Constants.h" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h index c244a697157..934e92a7d1c 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.h @@ -22,9 +22,9 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "orbsvcs/LoadBalancing/LB_Location_Index_Map.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LB_Location_Index_Map.h" -#include "orbsvcs/CosLoadBalancingS.h" +#include "orbsvcs/orbsvcs/CosLoadBalancingS.h" /** * @class TAO_LB_RoundRobin_Strategy diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index a03a561f291..4a7d114122e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -18,7 +18,7 @@ #include "ace/config-all.h" -#include "orbsvcs/LoadBalancing/LoadBalancing_export.h" +#include "orbsvcs/orbsvcs/LoadBalancing/LoadBalancing_export.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once |