diff options
Diffstat (limited to 'TAO/orbsvcs')
19 files changed, 61 insertions, 25 deletions
diff --git a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp index 3a8a8db6714..18edb1a1c48 100644 --- a/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp +++ b/TAO/orbsvcs/FTRT_Event_Service/Gateway_Service/FTRTEC_Gateway_Service.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/SString.h" #include "ace/OS_NS_stdio.h" #include "orbsvcs/FtRtEvent/Utils/FTEC_Gateway.h" #include "orbsvcs/FtRtEvent/Utils/resolve_init.h" diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp index 83df60813d3..ba03306ae7d 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_DefaultFaultAnalyzer.cpp @@ -18,6 +18,7 @@ #include "orbsvcs/FT_ReplicationManagerC.h" #include "orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.h" #include "tao/debug.h" +#include "ace/OS_NS_string.h" ACE_RCSID (FT_DefaultFaultAnalyzer, FT_DefaultFaultAnalyzer, @@ -166,4 +167,3 @@ int TAO::FT_DefaultFaultAnalyzer::analyze_fault_event ( // no-op return 0; } - diff --git a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp index a8f7556b3f6..b285d43d71f 100755 --- a/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp +++ b/TAO/orbsvcs/FT_ReplicationManager/FT_FaultEventDescriptor.cpp @@ -17,6 +17,8 @@ #include "FT_FaultEventDescriptor.h" +#include "ace/SString.h" + ACE_RCSID (FT_FaultEventDescriptor, FT_FaultEventDescriptor, "$Id$") @@ -88,4 +90,3 @@ void TAO::FT_FaultEventDescriptor::dump () )); } } - diff --git a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h index ec7dd75f590..db51bfd8155 100644 --- a/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h +++ b/TAO/orbsvcs/Fault_Detector/FT_FaultDetectorFactory_i.h @@ -16,8 +16,9 @@ #ifndef FT_FAULTDETECTORFACTORY_I_H_ #define FT_FAULTDETECTORFACTORY_I_H_ -#include /**/ <ace/pre.h> -#include <ace/ACE.h> +#include /**/ "ace/pre.h" +#include "ace/ACE.h" +#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h index ab820df236c..dd1d000722d 100644 --- a/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h +++ b/TAO/orbsvcs/Fault_Notifier/FT_Notifier_i.h @@ -21,6 +21,7 @@ #define TAO_FT_NOTIFIER_I_H_ #include /**/ "ace/pre.h" #include "ace/ACE.h" +#include "ace/SString.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp index a3480850d81..d015a33e1c9 100644 --- a/TAO/orbsvcs/TAO_Service/TAO_Service.cpp +++ b/TAO/orbsvcs/TAO_Service/TAO_Service.cpp @@ -23,8 +23,13 @@ #include "ace/Service_Config.h" #include "ace/Log_Msg.h" #include "ace/Signal.h" +#include "ace/Time_Value.h" + + +ACE_RCSID (TAO_Service, + TAO_Service, + "$Id$") -ACE_RCSID(TAO_Service, TAO_Service, "$Id$") extern "C" void handler (int) { diff --git a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h index d314e1785ca..80572e0054f 100644 --- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h +++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_Default_Factory.h @@ -1,4 +1,3 @@ -// $Id$ /* -*- C++ -*- */ //============================================================================= /** @@ -25,6 +24,7 @@ #include "CEC_Defaults.h" #include "ace/Service_Config.h" +#include "ace/Time_Value.h" /** * @class TAO_CEC_Default_Factory diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp index 997e60bf4bb..5ff419a69b0 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FtEventServiceInterceptor.cpp @@ -1,5 +1,6 @@ // $Id$ #include "ace/OS_NS_string.h" +#include "ace/SString.h" #include "orbsvcs/FT_CORBA_ORBC.h" #include "FtEventServiceInterceptor.h" #include "Request_Context_Repository.h" @@ -306,7 +307,7 @@ FtEventServiceInterceptor::send_reply (PortableInterceptor::ServerRequestInfo_pt void FtEventServiceInterceptor::send_exception ( - PortableInterceptor::ServerRequestInfo_ptr + PortableInterceptor::ServerRequestInfo_ptr ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException, PortableInterceptor::ForwardRequest)) @@ -333,7 +334,3 @@ FtEventServiceInterceptor::set_state(const FtRtecEventChannelAdmin::CachedOption { request_table_.set_state(state); } - - - - diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h index ceccdc02c25..2c54702549e 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/GroupInfoPublisher.h @@ -18,6 +18,7 @@ #include "ace/Vector_T.h" #include "ace/Singleton.h" #include "ace/Synch.h" +#include "ace/Auto_Ptr.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 33a734f56f7..5a2131175f4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -6,12 +6,16 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" + #include "ace/Null_Mutex.h" +#include "ace/OS_NS_string.h" + ACE_RCSID (LoadBalancing, LB_LeastLoaded, "$Id$") + #if !defined (__ACE_INLINE__) #include "LB_LeastLoaded.inl" #endif /* defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index a9865acf8b7..3bca0f64e9a 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -6,12 +6,16 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" + #include "ace/Null_Mutex.h" +#include "ace/OS_NS_string.h" + ACE_RCSID (LoadBalancing, LB_LoadAverage, "$Id$") + #if !defined (__ACE_INLINE__) #include "LB_LoadAverage.inl" #endif /* defined INLINE */ diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index c84794ebca0..93e336d1f16 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -16,9 +16,12 @@ #include "tao/ORB_Constants.h" #include "ace/Reactor.h" -#include "ace/OS_NS_sys_time.h" #include "ace/Reverse_Lock_T.h" +#include "ace/SString.h" +#include "ace/OS_NS_sys_time.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" + ACE_RCSID (LoadBalancing, LB_LoadManager, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 20da9cf52e5..cfc89538248 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -7,12 +7,16 @@ #include "tao/debug.h" #include "tao/ORB_Constants.h" + #include "ace/Null_Mutex.h" +#include "ace/OS_NS_string.h" + ACE_RCSID (LoadBalancing, LB_LoadMinimum, "$Id$") + #if !defined (__ACE_INLINE__) #include "LB_LoadMinimum.inl" #endif /* defined INLINE */ @@ -208,11 +212,11 @@ TAO_LB_LoadMinimum::next_member ( if (found_location) { -/* +/* ACE_DEBUG ((LM_DEBUG, "RETURNING REFERENCE FOR LOCATION \"%s\"\n", location[0].id.in ())); -*/ +*/ return load_manager->get_member_ref (object_group, location @@ -232,7 +236,7 @@ TAO_LB_LoadMinimum::next_member ( /* ACE_DEBUG ((LM_DEBUG, "CALLING RANDOM REFERENCE FOR LOCATION \n")); -*/ +*/ return TAO_LB_Random::_tao_next_member (object_group, load_manager, @@ -317,7 +321,7 @@ TAO_LB_LoadMinimum::analyze_loads ( } avg_load.value = total_load.value / len; -/* +/* ACE_DEBUG ((LM_DEBUG, "AVERAGE LOAD == %f" "\tMIN LOAD == %f\n", @@ -333,13 +337,13 @@ TAO_LB_LoadMinimum::analyze_loads ( { const PortableGroup::Location & loc = locations[j]; - /* + /* ACE_DEBUG ((LM_DEBUG, "EFFECTIVE_LOAD == %f\n" "AVERAGE == %f\n", tmp[i].value, avg_load.value)); - */ + */ if (tmp[j].value <= avg_load.value) { @@ -377,12 +381,12 @@ TAO_LB_LoadMinimum::analyze_loads ( } else if ((percent_diff > TAO_LB::LM_DEFAULT_DIFF_AVERAGE_CUTOFF) && (percent_diff < 1)) - { -/* + { +/* ACE_DEBUG ((LM_DEBUG, "%P --- ALERTING LOCATION %u\n", i)); -*/ +*/ load_manager->enable_alert (loc ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SECOND); @@ -445,7 +449,7 @@ TAO_LB_LoadMinimum::get_location ( load ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; -/* +/* ACE_DEBUG ((LM_DEBUG, "LOC == %u" "\tMIN LOAD == %f\n" diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index b056fc7622b..dff631c15fb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -1,13 +1,15 @@ #include "LB_ObjectReferenceFactory.h" - ACE_RCSID (LoadBalancing, LB_ObjectReferenceFactory, "$Id$") #include "tao/debug.h" + +#include "ace/SString.h" #include "ace/OS_NS_strings.h" +#include "ace/OS_NS_string.h" // The number of different object groups to support. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index ca9e032d827..ee4d822d116 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -3,6 +3,8 @@ #include "tao/debug.h" +#include "ace/OS_NS_string.h" + ACE_RCSID (LoadBalancing, LB_ServerRequestInterceptor, diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp index 30574272f8a..2b68be1073f 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Connector.cpp @@ -161,7 +161,7 @@ TAO::SSLIOP::Connector::connect (TAO::Profile_Transport_Resolver *resolver, // Flag that states whether any form of establishment of trust // should occur. - CORBA::Boolean establish_trust = + CORBA::Boolean const establish_trust = trust.trust_in_target || trust.trust_in_client; // @@ Should this be in a "policy validator?" diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp index 3493cd303a9..6dca8012e62 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Endpoint.cpp @@ -3,6 +3,7 @@ #include "tao/IIOP_Endpoint.h" #include "ace/OS_NS_stdio.h" +#include "ace/OS_NS_string.h" ACE_RCSID (SSLIOP, diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp index 87791a462fd..2e1694763ab 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Visitors.cpp @@ -6,7 +6,13 @@ #include "tao/DynamicAny/DynSequence_i.h" -ACE_RCSID(Trader, Constraint_Visitors, "$Id$") +#include "ace/OS_NS_string.h" + + +ACE_RCSID (Trader, + Constraint_Visitors, + "$Id$") + TAO_Constraint_Evaluator::Operand_Queue::Operand_Queue (void) { diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp index 091fbf125f3..fda16fbaa42 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.cpp @@ -24,11 +24,14 @@ #include "orbsvcs/CosConcurrencyControlC.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_unistd.h" +#include "ace/OS_NS_string.h" + ACE_RCSID (Concurrency, CC_command, "$Id$") + CC_Command::~CC_Command(void) { } |