diff options
76 files changed, 223 insertions, 617 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index dd73b4b5863..a969d20919d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,29 +1,125 @@ +Wed Jun 2 13:12:16 UTC 2010 Vladimir Zykov <vladimir.zykov@prismtech.com> + + * orbsvcs/orbsvcs/Log/EventLogNotification.h: + * orbsvcs/orbsvcs/Log/NotifyLogNotification.h: + * orbsvcs/orbsvcs/Log/RTEventLogNotification.h: + * orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h: + * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp: + * orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl: + * orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h: + * orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp: + * orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp: + * orbsvcs/orbsvcs/IFRService/ValueDef_i.h: + * tao/AnyTypeCode/Recursive_Type_TypeCode.h: + * tao/AnyTypeCode/Any_Impl_T.cpp: + * tao/AnyTypeCode/String_TypeCode_Traits.h: + * tao/AnyTypeCode/TypeCode_Value_Field.h: + * tao/AnyTypeCode/Any_Basic_Impl_T.cpp: + * tao/PortableServer/Any_SArg_Traits.h: + * tao/PortableServer/Special_Basic_SArguments.h: + * tao/PortableServer/Var_Size_SArgument_T.cpp: + * tao/PortableServer/Basic_SArguments.h: + * tao/PortableServer/TypeCode_SArg_Traits.h: + * tao/PortableServer/BD_String_SArgument_T.cpp: + * tao/PortableServer/Object_SArg_Traits.h: + * tao/Var_Size_Argument_T.cpp: + * tao/Var_Array_Argument_T.cpp: + * tao/String_Sequence_Element_T.h: + * tao/Object_Reference_Sequence_Element_T.h: + * tao/Array_VarOut_T.h: + * tao/Special_Basic_Arguments.h: + * tao/Pseudo_VarOut_T.inl: + * tao/Seq_Var_T.h: + * tao/BD_String_Argument_T.cpp: + * tao/Seq_Out_T.h: + * tao/Object_T.cpp: + * tao/Valuetype/Valuetype_Sequence_Element_T.h: + * tao/Valuetype/Bounded_Valuetype_Sequence_T.h: + * tao/Valuetype/Unbounded_Valuetype_Sequence_T.h: + * tao/RTScheduling/ThreadAction.h: + * tao/UB_String_Argument_T.h: + * tao/Fixed_Array_Argument_T.h: + Added missing include directives. + + * orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h: + * orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h: + * orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h: + * orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h: + * orbsvcs/orbsvcs/Event/EC_Busy_Lock.h: + * orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h: + * tao/AnyTypeCode/TypeCode_Struct_Field.h: + * tao/default_environment.h: + * tao/PortableServer/SArg_Traits_T.h: + * tao/PortableServer/Servant_Location.h: + * tao/VarOut_T.h: + * tao/Value_Traits_T.h: + * tao/Auto_Functor.h: + * tao/Arg_Traits_T.h: + * tao/TAO_Internal.h: + Added missing include of tao/Versioned_Namespace.h. + + * orbsvcs/orbsvcs/AV/Resource_Factory.h: + Fixed misspelt inclusion guard. + + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h: + * orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl: + * orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp: + * orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h: + Removed these files as they are not included in any library + and are duplicated partly in FT_ClientPolicy* and partly + in FT_ServerPolicy* files. + + * orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h: + Corrected include file. + + * tao/AnyTypeCode/Any_Arg_Traits.h: + * tao/AnyTypeCode/TypeCode_Case_Base_T.h: + Added missing includes and removed unnecessary in this case + forward declarations. + + * tao/Monitor/Monitor_Types.pidl: + * tao/Monitor/Monitor.pidl: + Added inclusion guards. + + * orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h: + * tao/Exception_Data.h: + Added forward declarations neccessary for compilation. + Wed Jun 2 13:07:25 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/be/be_helper.cpp: - + Fixed a bug in the streaming of a scoped name where 2 leading double colons could be output. Wed Jun 2 12:47:57 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/fe/y.tab.h: - + Removed tab apparently put there by bison regeneration. Wed Jun 2 12:40:29 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/fe/y.tab.h: * TAO_IDL/fe/idl.yy: - + Changes made already in - + Mon May 31 20:48:24 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> - + but apparently reverted in - + Tue Jun 1 15:34:34 UTC 2010 jeff Parsons <j.parsons@vanderbilt.edu> - + that define the signed and unsigned members of the big union used by the parser as 64-bit types. diff --git a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h index 4b32ac58a85..e5922bd5664 100644 --- a/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h +++ b/TAO/orbsvcs/orbsvcs/AV/Resource_Factory.h @@ -11,7 +11,7 @@ #ifndef TAO_AV_DEFAULT_RESOURCE_FACTORY_H -#define TAO_AV_DEFAULT_RESOURCE_FCATORY_H +#define TAO_AV_DEFAULT_RESOURCE_FACTORY_H #include /**/ "ace/pre.h" #include "orbsvcs/AV/AVStreams_i.h" diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h index 2e540ea1b5d..b8a1d4df7ee 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Busy_Lock.h @@ -18,6 +18,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "tao/Versioned_Namespace.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL /// Adapt classes that implement the "busy lock" protocol, to conform diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp index 15c71e92254..b84042c958f 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Read.cpp @@ -5,6 +5,8 @@ #include "orbsvcs/ESF/ESF_Copy_On_Read.h" #include "orbsvcs/ESF/ESF_Worker.h" +#include "tao/Exception.h" +#include "ace/Guard_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp index 281fc38c37b..07aa3444b4d 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp @@ -4,6 +4,7 @@ #define TAO_ESF_COPY_ON_WRITE_CPP #include "orbsvcs/ESF/ESF_Copy_On_Write.h" +#include "ace/Guard_T.h" #if ! defined (__ACE_INLINE__) #include "orbsvcs/ESF/ESF_Copy_On_Write.inl" diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp index 2b7c4e4eb09..bc317ef0748 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.cpp @@ -12,8 +12,10 @@ #include "orbsvcs/ESF/ESF_Defaults.h" #include "orbsvcs/ESF/ESF_Worker.h" #include "orbsvcs/ESF/ESF_Delayed_Command.h" +#include "tao/SystemException.h" #include "ace/Functor.h" +#include "ace/Guard_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h index 36742c93d80..1884843ec41 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Changes.h @@ -19,7 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/ESF/ESF_Busy_Lock.h" - +#include "tao/Basic_Types.h" #include "ace/Containers.h" ACE_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h index 8901a51c3f1..4c804304f54 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.h @@ -19,6 +19,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "tao/Versioned_Namespace.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl index 4e4807d8a29..6e49c5a1506 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Immediate_Changes.inl @@ -2,6 +2,8 @@ // // $Id$ +#include "ace/Guard_T.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class PROXY, class COLLECTION, class ITERATOR, class ACE_LOCK> void diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h index 86ed4f5bf86..c86dc5d2592 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_Collection.h @@ -20,6 +20,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "tao/Versioned_Namespace.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class Target> class TAO_ESF_Worker; diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h index 3fb57afd60d..ef871ddb473 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_List.h @@ -17,6 +17,8 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "tao/Versioned_Namespace.h" + #include "ace/Unbounded_Set.h" #include "ace/Containers.h" diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h index 489defef7c1..07c2ea52db5 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Proxy_RB_Tree.h @@ -17,7 +17,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include /**/ "tao/Versioned_Namespace.h" + #include "ace/RB_Tree.h" +#include "ace/Null_Mutex.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp index 21c1ec6be72..68274471b1a 100644 --- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp +++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Shutdown_Proxy.cpp @@ -4,6 +4,7 @@ #define TAO_ESF_SHUTDOWN_PROXY_CPP #include "orbsvcs/ESF/ESF_Shutdown_Proxy.h" +#include "tao/Exception.h" #include "ace/CORBA_macros.h" #if ! defined (__ACE_INLINE__) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h index e9436b93c4c..8626df3f6e6 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Busy_Lock.h @@ -17,6 +17,8 @@ #define TAO_EC_BUSY_LOCK_H #include /**/ "ace/pre.h" +#include /**/ "tao/Versioned_Namespace.h" + #include "ace/config-all.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h index 3bd52930bce..8e647fd8456 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Kokyu_Filter_Builder.h @@ -24,6 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/Event/rtkokyu_event_export.h" +#include "orbsvcs/RtecSchedulerC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h index 0cf0577f6a4..73e6d611754 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h +++ b/TAO/orbsvcs/orbsvcs/Event/EC_Sched_Filter_Builder.h @@ -24,6 +24,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "orbsvcs/Event/sched_event_export.h" +#include "orbsvcs/RtecSchedulerC.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h index b544ada7263..911f625c67f 100644 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_ORBInitializer.h @@ -20,7 +20,7 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#include "tao/PortableInterceptorC.h" +#include "tao/PI/PI.h" #include "tao/LocalObject.h" #include "orbsvcs/FaultTolerance/fault_tol_export.h" diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp deleted file mode 100644 index 2c101c7601f..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// -*- C++ -*- -// -// $Id$ - -#include "orbsvcs/FaultTolerance/FT_PolicyFactory.h" -#include "orbsvcs/FaultTolerance/FT_Policy_i.h" -#include "orbsvcs/FT_CORBA_ORBC.h" -#include "tao/PolicyC.h" - - -ACE_RCSID (FaultTolerance, FT_PolicyFactory, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -CORBA::Policy_ptr -TAO_FT_PolicyFactory::create_policy ( - CORBA::PolicyType type, - const CORBA::Any &val) -{ - - if (type == FT::REQUEST_DURATION_POLICY) - return TAO_FT_Request_Duration_Policy::create (val); - else if (type == FT::HEARTBEAT_POLICY) - return TAO_FT_Heart_Beat_Policy::create (val); - else if (type == FT::HEARTBEAT_ENABLED_POLICY) - return TAO_FT_Heart_Beat_Enabled_Policy::create (val); - - throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE); -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h deleted file mode 100644 index 5bb75dfa353..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_PolicyFactory.h +++ /dev/null @@ -1,60 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file FT_PolicyFactory.h - * - * $Id$ - * - * @author Bala Natarajan <bala@cs.wustl.edu> - */ -//============================================================================= - - -#ifndef TAO_FT_POLICY_FACTORY_H -#define TAO_FT_POLICY_FACTORY_H - -#include /**/ "ace/pre.h" - -#include "tao/corbafwd.h" - - -#if !defined (ACE_LACKS_PRAGMA_ONCE) -# pragma once -#endif /* ACE_LACKS_PRAGMA_ONCE */ - -#include "tao/PortableInterceptorC.h" -#include "tao/LocalObject.h" - -// This is to remove "inherits via dominance" warnings from MSVC. -// MSVC is being a little too paranoid. -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - -#include "orbsvcs/FaultTolerance/fault_tol_export.h" - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/// Policy factory for all FTCORBA related policies. -class TAO_FT_PolicyFactory - : public PortableInterceptor::PolicyFactory - , public ::CORBA::LocalObject -{ -public: - - virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any &value); -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - - -#include /**/ "ace/post.h" - -#endif /* TAO_FT_POLICY_FACTORY_H */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp deleted file mode 100644 index de34ec90dd8..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.cpp +++ /dev/null @@ -1,234 +0,0 @@ -//$Id$ -#include "orbsvcs/FaultTolerance/FT_Policy_i.h" - -#include "tao/debug.h" - -#if !defined (__ACE_INLINE__) -#include "orbsvcs/FaultTolerance/FT_Policy_i.inl" -#endif /* __ACE_INLINE__ */ - -ACE_RCSID(FaultTolerance, FT_Policy_i, "$Id$") - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -TimeBase::TimeT -TAO_FT_Request_Duration_Policy::request_duration_policy_value (void) -{ - return this->request_duration_; -} - -CORBA::PolicyType -TAO_FT_Request_Duration_Policy::policy_type (void) -{ - return FT::REQUEST_DURATION_POLICY; -} - -CORBA::Policy_ptr -TAO_FT_Request_Duration_Policy::create (const CORBA::Any& val) -{ - TimeBase::TimeT value; - if ((val >>= value) == 0) - throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE); - - TAO_FT_Request_Duration_Policy *tmp; - ACE_NEW_THROW_EX (tmp, - TAO_FT_Request_Duration_Policy (value), - CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); - - return tmp; -} - -TAO_FT_Request_Duration_Policy * -TAO_FT_Request_Duration_Policy::clone (void) const -{ - TAO_FT_Request_Duration_Policy *copy = 0; - ACE_NEW_RETURN (copy, - TAO_FT_Request_Duration_Policy (*this), - 0); - return copy; -} - -CORBA::Policy_ptr -TAO_FT_Request_Duration_Policy::copy (void) -{ - TAO_FT_Request_Duration_Policy* tmp; - ACE_NEW_THROW_EX (tmp, TAO_FT_Request_Duration_Policy (*this), - CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); - - return tmp; -} - -void -TAO_FT_Request_Duration_Policy::destroy (void) -{ -} - -void -TAO_FT_Request_Duration_Policy::set_time_value (ACE_Time_Value &time_value) -{ - TimeBase::TimeT t = this->request_duration_; - TimeBase::TimeT seconds = t / 10000000u; - TimeBase::TimeT microseconds = (t % 10000000u) / 10; - time_value.set (ACE_U64_TO_U32 (seconds), - ACE_U64_TO_U32 (microseconds)); - - if (TAO_debug_level > 0) - { - CORBA::ULong msecs = - static_cast<CORBA::ULong> (microseconds / 1000); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_FT (%P|%t) - Timeout is <%u>\n"), - msecs)); - } -} - - -/*****************************************************************/ - -FT::HeartbeatPolicyValue -TAO_FT_Heart_Beat_Policy::heartbeat_policy_value (void) -{ - FT::HeartbeatPolicyValue val; - val.heartbeat = this->heartbeat_; - val.heartbeat_interval = this->heartbeat_interval_; - val.heartbeat_timeout = this->heartbeat_timeout_; - - return val; -} - - -CORBA::Policy_ptr -TAO_FT_Heart_Beat_Policy::create (const CORBA::Any& val) -{ - FT::HeartbeatPolicyValue *value; - if ((val >>= value) == 0) - throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE); - - TAO_FT_Heart_Beat_Policy *tmp; - ACE_NEW_THROW_EX (tmp, - TAO_FT_Heart_Beat_Policy (value->heartbeat, - value->heartbeat_interval, - value->heartbeat_timeout), - CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); - - return tmp; -} - - -CORBA::PolicyType -TAO_FT_Heart_Beat_Policy::policy_type (void) -{ - return FT::HEARTBEAT_POLICY; -} - - -CORBA::Policy_ptr -TAO_FT_Heart_Beat_Policy::copy (void) -{ - TAO_FT_Heart_Beat_Policy * tmp; - ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Policy (*this), - CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); - - return tmp; -} - -TAO_FT_Heart_Beat_Policy * -TAO_FT_Heart_Beat_Policy::clone (void) const -{ - TAO_FT_Heart_Beat_Policy *copy = 0; - ACE_NEW_RETURN (copy, - TAO_FT_Heart_Beat_Policy (*this), - 0); - return copy; -} - -void -TAO_FT_Heart_Beat_Policy::destroy (void) -{ -} - -void -TAO_FT_Heart_Beat_Policy::set_time_value (ACE_Time_Value &time_value, - const TimeBase::TimeT &timebase) -{ - TimeBase::TimeT t = timebase; - TimeBase::TimeT seconds = t / 10000000u; - TimeBase::TimeT microseconds = (t % 10000000u) / 10; - time_value.set (ACE_U64_TO_U32 (seconds), - ACE_U64_TO_U32 (microseconds)); - - if (TAO_debug_level > 0) - { - CORBA::ULong msecs = - static_cast<CORBA::ULong> (microseconds / 1000); - ACE_DEBUG ((LM_DEBUG, - ACE_TEXT ("TAO_FT (%P|%t) - Timeout is <%u>\n"), - msecs)); - } -} - -/******************************************************************/ - -CORBA::Boolean -TAO_FT_Heart_Beat_Enabled_Policy::heartbeat_enabled_policy_value () -{ - return this->heartbeat_enabled_value_; -} - - -CORBA::Policy_ptr -TAO_FT_Heart_Beat_Enabled_Policy::create (const CORBA::Any& val) -{ - CORBA::Boolean value; - - if ((val >>= CORBA::Any::to_boolean (value)) == 0) - throw CORBA::PolicyError (CORBA::BAD_POLICY_TYPE); - - TAO_FT_Heart_Beat_Enabled_Policy *tmp; - ACE_NEW_THROW_EX (tmp, - TAO_FT_Heart_Beat_Enabled_Policy (value), - CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); - - return tmp; -} - -CORBA::PolicyType -TAO_FT_Heart_Beat_Enabled_Policy::policy_type (void) -{ - return FT::HEARTBEAT_ENABLED_POLICY; -} - - -CORBA::Policy_ptr -TAO_FT_Heart_Beat_Enabled_Policy::copy (void) -{ - TAO_FT_Heart_Beat_Enabled_Policy * tmp; - ACE_NEW_THROW_EX (tmp, TAO_FT_Heart_Beat_Enabled_Policy (*this), - CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); - - return tmp; -} - -TAO_FT_Heart_Beat_Enabled_Policy * -TAO_FT_Heart_Beat_Enabled_Policy::clone (void) const -{ - TAO_FT_Heart_Beat_Enabled_Policy *copy = 0; - ACE_NEW_RETURN (copy, - TAO_FT_Heart_Beat_Enabled_Policy (*this), - 0); - return copy; -} - - -void -TAO_FT_Heart_Beat_Enabled_Policy::destroy (void) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h deleted file mode 100644 index 55c1f2f5ab8..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.h +++ /dev/null @@ -1,192 +0,0 @@ -// -*- C++ -*- - -//============================================================================= -/** - * @file FT_Policy_i.h - * - * $Id$ - * - * @author Balachandran Natarajan <bala@cs.wustl.edu> - */ -//============================================================================= - - -#ifndef TAO_FT_POLICY_I_H -#define TAO_FT_POLICY_I_H -#include /**/ "ace/pre.h" - -#include "orbsvcs/FT_CORBA_ORBC.h" - -#if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable:4250) -#endif /* _MSC_VER */ - - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -/** - * @class TAO_FT_Request_Duration_Policy - * - * @brief FT::RequestDurationPolicy implementation - * - * This policy controls the request duration in the ORB. The - * semantics are like this. On the server side, the server should - * retain the details of the request from the client (and the - * reply sent to it too) atleast for the time period specified by - * this policy value. On the client side, the client uses this - * value to calculate the expiration_id in the RequestService - * context. The expiration_id is a sort of timeout for the client - * to keep trying to connect to server object groups under certain - * conditions. - */ -class TAO_FT_Request_Duration_Policy - : public FT::RequestDurationPolicy, - public ::CORBA::LocalObject -{ -public: - - /// Constructor. - TAO_FT_Request_Duration_Policy (const TimeBase::TimeT& relative_expiry); - - /// Copy constructor. - TAO_FT_Request_Duration_Policy (const TAO_FT_Request_Duration_Policy &rhs); - - /// Helper method for the implementation of - /// CORBA::ORB::create_policy. - static CORBA::Policy_ptr create (const CORBA::Any& val); - - /// Returns a copy of <this>. - virtual TAO_FT_Request_Duration_Policy *clone (void) const; - - // = The FT::RequestDurationPolicy methods - virtual TimeBase::TimeT request_duration_policy_value (void); - - virtual CORBA::PolicyType policy_type (); - - virtual CORBA::Policy_ptr copy (); - - virtual void destroy (); - - /// Change the CORBA representation to the ACE representation. - void set_time_value (ACE_Time_Value &time_value); - -private: - /// The attribute - TimeBase::TimeT request_duration_; -}; - - -/** - * @class TAO_FT_Heart_Beat_Policy - * - * @brief FT::HeartBeatPolicy - * - * If this policy is set, it enables the client ORB to send - * heartbeats to the server ORB over the open connections. - */ -class TAO_FT_Export TAO_FT_Heart_Beat_Policy - : public FT::HeartbeatPolicy, - public ::CORBA::LocalObject -{ -public: - - /// Constructor. - TAO_FT_Heart_Beat_Policy (const CORBA::Boolean boolean, - const TimeBase::TimeT &interval, - const TimeBase::TimeT &timeout); - - /// Copy constructor. - TAO_FT_Heart_Beat_Policy (const TAO_FT_Heart_Beat_Policy &rhs); - - /// Helper method for the implementation of - /// CORBA::ORB::create_policy. - static CORBA::Policy_ptr create (const CORBA::Any& val); - - /// Returns a copy of <this>. - virtual TAO_FT_Heart_Beat_Policy *clone (void) const; - - // = The FT::HeartBeatPolicy methods - virtual FT::HeartbeatPolicyValue heartbeat_policy_value (void); - - virtual CORBA::PolicyType policy_type (); - - virtual CORBA::Policy_ptr copy (); - - virtual void destroy (); - - /// Change the CORBA representation to the ACE representation. - void set_time_value (ACE_Time_Value &time_value, - const TimeBase::TimeT &timebase); - -private: - - // The attributes - /// <heartbeat_> indicates whether heartbeating is enabled or not. - CORBA::Boolean heartbeat_; - - /// Intervals in which heartbeat messages need to be sent - TimeBase::TimeT heartbeat_interval_; - - /// The timeouts for the heartbeats - TimeBase::TimeT heartbeat_timeout_; -}; - -/** - * @class TAO_FT_Heart_Beat_Enabled_Policy - * - * @brief FT::HeartBeatEnabledPolicy - * - * If this policy is set, it enables the server ORB to set - * the TAG_FT_HEARTBEAT_ENABLED component in the IOP profile of - * the IOR that it exposes - */ -class TAO_FT_Export TAO_FT_Heart_Beat_Enabled_Policy - : public FT::HeartbeatEnabledPolicy, - public ::CORBA::LocalObject -{ -public: - - /// Constructor. - TAO_FT_Heart_Beat_Enabled_Policy (const CORBA::Boolean boolean); - - /// Copy constructor. - TAO_FT_Heart_Beat_Enabled_Policy ( - const TAO_FT_Heart_Beat_Enabled_Policy &rhs); - - static CORBA::Policy_ptr create (const CORBA::Any& val); - - // Helper method for the implementation of - // CORBA::ORB::create_policy. - - /// Returns a copy of <this>. - virtual TAO_FT_Heart_Beat_Enabled_Policy *clone (void) const; - - // = The FT::HeartBeatPolicy methods - virtual CORBA::Boolean heartbeat_enabled_policy_value (); - - virtual CORBA::PolicyType policy_type (); - - virtual CORBA::Policy_ptr copy (); - - virtual void destroy (); - -private: - - /// indicates whether heartbeating is enabled or not. - CORBA::Boolean heartbeat_enabled_value_; -}; - -TAO_END_VERSIONED_NAMESPACE_DECL - -#if defined(_MSC_VER) -#pragma warning(pop) -#endif /* _MSC_VER */ - -#if defined (__ACE_INLINE__) -#include "orbsvcs/FaultTolerance/FT_Policy_i.inl" -#endif /* __ACE_INLINE__ */ - - -#include /**/ "ace/post.h" -#endif /* TAO_FT_POLICY_I_H */ diff --git a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl b/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl deleted file mode 100644 index e07682aff63..00000000000 --- a/TAO/orbsvcs/orbsvcs/FaultTolerance/FT_Policy_i.inl +++ /dev/null @@ -1,74 +0,0 @@ -// -*- C++ -*- -// -//$Id$ - -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -ACE_INLINE -TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TimeBase::TimeT &duration) - :ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () - , request_duration_ (duration) -{ -} - -ACE_INLINE -TAO_FT_Request_Duration_Policy::TAO_FT_Request_Duration_Policy (const TAO_FT_Request_Duration_Policy &rhs) - :ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , FT::RequestDurationPolicy () - , ACE_NESTED_CLASS (CORBA, LocalObject) () - , request_duration_ (rhs.request_duration_) -{ -} - -ACE_INLINE -TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy ( - const CORBA::Boolean heartbeat, - const TimeBase::TimeT &interval, - const TimeBase::TimeT &timeout) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () - , heartbeat_ (heartbeat) - , heartbeat_interval_ (interval) - , heartbeat_timeout_ (timeout) -{ -} - -ACE_INLINE -TAO_FT_Heart_Beat_Policy::TAO_FT_Heart_Beat_Policy (const TAO_FT_Heart_Beat_Policy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () - , FT::HeartbeatPolicy () - , heartbeat_ (rhs.heartbeat_) - , heartbeat_interval_ (rhs.heartbeat_interval_) - , heartbeat_timeout_ (rhs.heartbeat_timeout_) -{ -} - - -ACE_INLINE -TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( - const CORBA::Boolean heartbeat) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () - , heartbeat_enabled_value_ (heartbeat) -{ -} - -ACE_INLINE -TAO_FT_Heart_Beat_Enabled_Policy::TAO_FT_Heart_Beat_Enabled_Policy ( - const TAO_FT_Heart_Beat_Enabled_Policy &rhs) - : ACE_NESTED_CLASS (CORBA, Object) () - , ACE_NESTED_CLASS (CORBA, Policy) () - , ACE_NESTED_CLASS (CORBA, LocalObject) () - , FT::HeartbeatEnabledPolicy () - , heartbeat_enabled_value_ (rhs.heartbeat_enabled_value_) -{ -} - -TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp index 88fb48cab74..48efde46c4a 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/ConnectionHandler_T.cpp @@ -1,5 +1,7 @@ // $Id$ +#include "ace/INET_Addr.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <ACE_PEER_STREAM_1> diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp index 5eed0465310..362604c7599 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/EventChannel/FT_ProxyAdmin_T.cpp @@ -2,6 +2,7 @@ #include "orbsvcs/FtRtEvent/EventChannel/IOGR_Maker.h" #include "orbsvcs/FtRtEvent/EventChannel/Replication_Service.h" +#include "tao/PortableServer/POAC.h" #include "ace/Synch_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h index 1b0dc0bc02d..bf93b46a46c 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/ScopeGuard.h @@ -13,6 +13,8 @@ #ifndef SCOPEGUARD_H_ #define SCOPEGUARD_H_ +#include /**/ "tao/Versioned_Namespace.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <class T> diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h index c9fa2c626bd..7804fcfda07 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/activate_with_id.h @@ -13,6 +13,9 @@ #include "tao/Versioned_Namespace.h" +#include "orbsvcs/FtRtecEventCommC.h" +#include "tao/PortableServer/POAC.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> diff --git a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h index c09ee873041..c5944651d37 100644 --- a/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h +++ b/TAO/orbsvcs/orbsvcs/FtRtEvent/Utils/resolve_init.h @@ -13,6 +13,9 @@ #include "tao/Versioned_Namespace.h" +#include "tao/ORB.h" +#include "tao/Object.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<class T> diff --git a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h index 51f73903509..c273754ee01 100644 --- a/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h +++ b/TAO/orbsvcs/orbsvcs/IFRService/ValueDef_i.h @@ -19,6 +19,7 @@ #define TAO_VALUEDEF_I_H #include "orbsvcs/IFRService/Contained_i.h" +#include "orbsvcs/IFRService/Container_i.h" #include "orbsvcs/IFRService/IDLType_i.h" #include "orbsvcs/IFRService/ifr_service_export.h" diff --git a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h index 1bf43eb1d7b..9453c468b49 100644 --- a/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/EventLogNotification.h @@ -27,6 +27,7 @@ #include "orbsvcs/DsEventLogAdminS.h" #include "orbsvcs/CosEvent/CEC_Default_Factory.h" #include "orbsvcs/CosEventCommS.h" +#include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/eventlog_serv_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h index 22c2b19e0d7..2d3268a37df 100644 --- a/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/NotifyLogNotification.h @@ -26,7 +26,7 @@ #include "orbsvcs/CosEventCommS.h" #include "orbsvcs/CosNotifyChannelAdminS.h" #include "orbsvcs/CosNotifyCommC.h" - +#include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/notifylog_serv_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h index 22fa66d06c3..72bc3a6491b 100644 --- a/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h +++ b/TAO/orbsvcs/orbsvcs/Log/RTEventLogNotification.h @@ -29,7 +29,7 @@ #include "orbsvcs/RtecEventCommS.h" #include "orbsvcs/Event/EC_ProxySupplier.h" #include "orbsvcs/Event/EC_ProxyConsumer.h" - +#include "orbsvcs/Log/LogNotification.h" #include "orbsvcs/Log/rteventlog_serv_export.h" #if defined(_MSC_VER) diff --git a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h index 4218b4b627a..3758f68756e 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h +++ b/TAO/orbsvcs/orbsvcs/Notify/Save_Persist_Worker_T.h @@ -25,6 +25,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO_Notify { + class Topology_Saver; + /** * \brief Iterate through children saving persistent topology information. */ diff --git a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp index 0b048d75502..a9576fb69de 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Validate_Worker_T.cpp @@ -5,6 +5,7 @@ #include "Validate_Worker_T.h" #include "tao/debug.h" +#include "ace/Log_Msg.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) #pragma once diff --git a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h index 7110836d9af..f88de938739 100644 --- a/TAO/tao/AnyTypeCode/Any_Arg_Traits.h +++ b/TAO/tao/AnyTypeCode/Any_Arg_Traits.h @@ -22,16 +22,13 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/AnyTypeCode/Any.h" #include "tao/Var_Size_Argument_T.h" #include "tao/Arg_Traits_T.h" +#include "tao/Any_Insert_Policy_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL -namespace CORBA -{ - class Any; -} - namespace TAO { template<> diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp index 185d8915034..a475480d605 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.cpp @@ -7,6 +7,7 @@ #include "tao/AnyTypeCode/Any.h" #include "tao/AnyTypeCode/Any_Unknown_IDL_Type.h" #include "tao/AnyTypeCode/Marshal.h" +#include "tao/AnyTypeCode/TypeCode.h" #include "tao/SystemException.h" #include "tao/CDR.h" diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp index fe770493a5a..0416b960acf 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.cpp @@ -8,6 +8,7 @@ #include "tao/AnyTypeCode/Marshal.h" #include "tao/CDR.h" #include "tao/AnyTypeCode/TypeCode.h" +#include "tao/AnyTypeCode/Any.h" #include "tao/SystemException.h" #include "tao/debug.h" diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 75bcdd79a30..f9ebdfab5ff 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -18,6 +18,7 @@ #include /**/ "ace/pre.h" +#include "tao/AnyTypeCode/ValueModifierC.h" #include "tao/Basic_Types.h" #include "tao/Typecode_typesC.h" #include "ace/Recursive_Thread_Mutex.h" diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h index 2b921ddc93a..b5213929e22 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Traits.h @@ -27,6 +27,7 @@ #include "tao/AnyTypeCode/String_TypeCode.h" #include "tao/AnyTypeCode/True_RefCount_Policy.h" +#include "tao/AnyTypeCode/Any.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index 0cdfcdef901..c4a25df112c 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -23,15 +23,10 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -TAO_BEGIN_VERSIONED_NAMESPACE_DECL - -namespace CORBA -{ - class TypeCode; - typedef TypeCode* TypeCode_ptr; +#include "tao/AnyTypeCode/TypeCode.h" +#include "tao/CORBA_String.h" - class Any; -} +TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { diff --git a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h index 1a3d8c9deb4..e0216b21da7 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Struct_Field.h @@ -20,6 +20,8 @@ #include "ace/config-all.h" +#include /**/ "tao/Versioned_Namespace.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h index c421189f0f5..ca1d902981d 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Value_Field.h @@ -17,8 +17,12 @@ #include /**/ "ace/pre.h" +#include /**/ "tao/Versioned_Namespace.h" + #include "ace/config-all.h" +#include "tao/AnyTypeCode/VisibilityC.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/Arg_Traits_T.h b/TAO/tao/Arg_Traits_T.h index f71e79b2f27..286d8c5b505 100644 --- a/TAO/tao/Arg_Traits_T.h +++ b/TAO/tao/Arg_Traits_T.h @@ -15,6 +15,8 @@ #include /**/ "ace/pre.h" +#include /**/ "tao/Versioned_Namespace.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index b70fd19c6b6..e638ee402f6 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -17,10 +17,14 @@ #include /**/ "ace/pre.h" +#include /**/ "tao/Versioned_Namespace.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Basic_Types.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/Auto_Functor.h b/TAO/tao/Auto_Functor.h index a764aea0e3d..98eb6d73bec 100644 --- a/TAO/tao/Auto_Functor.h +++ b/TAO/tao/Auto_Functor.h @@ -15,6 +15,8 @@ #include "ace/config-all.h" +#include /**/ "tao/Versioned_Namespace.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/BD_String_Argument_T.cpp b/TAO/tao/BD_String_Argument_T.cpp index b5dd473351f..2167ce1b403 100644 --- a/TAO/tao/BD_String_Argument_T.cpp +++ b/TAO/tao/BD_String_Argument_T.cpp @@ -4,6 +4,7 @@ #define TAO_BD_STRING_ARGUMENT_T_CPP #include "tao/BD_String_Argument_T.h" +#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) #include "tao/BD_String_Argument_T.inl" diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h index ff1794b49db..d0f62c7161b 100644 --- a/TAO/tao/Exception_Data.h +++ b/TAO/tao/Exception_Data.h @@ -28,6 +28,8 @@ namespace CORBA { class TypeCode; typedef TypeCode *TypeCode_ptr; + + class Exception; } namespace TAO diff --git a/TAO/tao/Fixed_Array_Argument_T.h b/TAO/tao/Fixed_Array_Argument_T.h index 70269fbb4db..84ab54e37a2 100644 --- a/TAO/tao/Fixed_Array_Argument_T.h +++ b/TAO/tao/Fixed_Array_Argument_T.h @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include "tao/Argument.h" +#include "tao/Array_Traits_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Monitor/Monitor.pidl b/TAO/tao/Monitor/Monitor.pidl index 798932fd136..1182d7b6e08 100644 --- a/TAO/tao/Monitor/Monitor.pidl +++ b/TAO/tao/Monitor/Monitor.pidl @@ -1,5 +1,8 @@ // $Id$ +#ifndef TAO_MONITOR_MONITOR_PIDL +#define TAO_MONITOR_MONITOR_PIDL + #include "tao/Monitor/Monitor_Types.pidl" module Monitor @@ -54,3 +57,5 @@ module Monitor void unregister_constraints (in ConstraintStructList constraint); }; }; + +#endif /* TAO_MONITOR_MONITOR_PIDL */ diff --git a/TAO/tao/Monitor/Monitor_Types.pidl b/TAO/tao/Monitor/Monitor_Types.pidl index de9a67f57dd..32fe74f6dc2 100644 --- a/TAO/tao/Monitor/Monitor_Types.pidl +++ b/TAO/tao/Monitor/Monitor_Types.pidl @@ -1,5 +1,8 @@ // $Id$ +#ifndef TAO_MONITOR_MONITOR_TYPES_PIDL +#define TAO_MONITOR_MONITOR_TYPES_PIDL + #include "tao/TimeBase.pidl" #include "tao/StringSeq.pidl" @@ -47,3 +50,5 @@ module Monitor }; typedef sequence<ConstraintStruct> ConstraintStructList; }; + +#endif /* TAO_MONITOR_MONITOR_TYPES_PIDL */ diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h index ba9c656b865..c58ae22af1f 100644 --- a/TAO/tao/Object_Reference_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Sequence_Element_T.h @@ -12,6 +12,8 @@ */ #include "tao/Basic_Types.h" +#include <algorithm> + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/Object_T.cpp b/TAO/tao/Object_T.cpp index 8e3212a8138..e48f0a5287c 100644 --- a/TAO/tao/Object_T.cpp +++ b/TAO/tao/Object_T.cpp @@ -4,6 +4,7 @@ #define TAO_OBJECT_T_CPP #include "tao/Object_T.h" +#include "tao/Object.h" #include "tao/Stub.h" #include "tao/SystemException.h" #include "ace/CORBA_macros.h" diff --git a/TAO/tao/PortableServer/Any_SArg_Traits.h b/TAO/tao/PortableServer/Any_SArg_Traits.h index 1f966e2a3b6..8ef6f99b1e0 100644 --- a/TAO/tao/PortableServer/Any_SArg_Traits.h +++ b/TAO/tao/PortableServer/Any_SArg_Traits.h @@ -24,6 +24,7 @@ #include "tao/PortableServer/Var_Size_SArgument_T.h" #include "tao/PortableServer/SArg_Traits_T.h" #include "tao/PortableServer/portableserver_export.h" +#include "tao/AnyTypeCode/Any.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index 6f2a7969137..c10caac89fc 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -4,6 +4,7 @@ #define TAO_BD_STRING_SARGUMENT_T_CPP #include "tao/PortableServer/BD_String_SArgument_T.h" +#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) #include "tao/PortableServer/BD_String_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Basic_SArguments.h b/TAO/tao/PortableServer/Basic_SArguments.h index 522c80370d6..eaedf834235 100644 --- a/TAO/tao/PortableServer/Basic_SArguments.h +++ b/TAO/tao/PortableServer/Basic_SArguments.h @@ -24,6 +24,7 @@ #include "tao/PortableServer/Basic_SArgument_T.h" #include "tao/PortableServer/SArg_Traits_T.h" +#include "tao/Any_Insert_Policy_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Object_SArg_Traits.h b/TAO/tao/PortableServer/Object_SArg_Traits.h index 6f9189fbb1f..08421b6a99d 100644 --- a/TAO/tao/PortableServer/Object_SArg_Traits.h +++ b/TAO/tao/PortableServer/Object_SArg_Traits.h @@ -25,6 +25,7 @@ #include "tao/PortableServer/SArg_Traits_T.h" #include "tao/Pseudo_VarOut_T.h" #include "tao/Any_Insert_Policy_T.h" +#include "tao/PortableServer/portableserver_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/SArg_Traits_T.h b/TAO/tao/PortableServer/SArg_Traits_T.h index 09f01b6bef4..b1218fcf22a 100644 --- a/TAO/tao/PortableServer/SArg_Traits_T.h +++ b/TAO/tao/PortableServer/SArg_Traits_T.h @@ -16,6 +16,8 @@ #include /**/ "ace/pre.h" +#include /**/ "tao/Versioned_Namespace.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/PortableServer/Servant_Location.h b/TAO/tao/PortableServer/Servant_Location.h index 7ab08442408..e0b9b1516c7 100644 --- a/TAO/tao/PortableServer/Servant_Location.h +++ b/TAO/tao/PortableServer/Servant_Location.h @@ -17,6 +17,8 @@ #include "tao/PortableServer/portableserver_export.h" +#include /**/ "tao/Versioned_Namespace.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ diff --git a/TAO/tao/PortableServer/Special_Basic_SArguments.h b/TAO/tao/PortableServer/Special_Basic_SArguments.h index eae031847fb..b253f364670 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArguments.h +++ b/TAO/tao/PortableServer/Special_Basic_SArguments.h @@ -25,6 +25,7 @@ #include "tao/PortableServer/Special_Basic_SArgument_T.h" #include "tao/PortableServer/SArg_Traits_T.h" +#include "tao/Any_Insert_Policy_T.h" #include "ace/CDR_Stream.h" diff --git a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h index 77eff8e57ad..bcd84301e6e 100644 --- a/TAO/tao/PortableServer/TypeCode_SArg_Traits.h +++ b/TAO/tao/PortableServer/TypeCode_SArg_Traits.h @@ -23,6 +23,8 @@ #include "tao/PortableServer/Object_SArgument_T.h" #include "tao/Pseudo_VarOut_T.h" +#include "tao/Any_Insert_Policy_T.h" +#include "tao/PortableServer/portableserver_export.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp index 79ae2d0fbc9..a0aed6f8d57 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp @@ -4,6 +4,7 @@ #define TAO_VAR_SIZE_SARGUMENT_T_CPP #include "tao/PortableServer/Var_Size_SArgument_T.h" +#include "tao/SystemException.h" #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Size_SArgument_T.inl" diff --git a/TAO/tao/Pseudo_VarOut_T.inl b/TAO/tao/Pseudo_VarOut_T.inl index bbfb69aedc8..cee238c4602 100644 --- a/TAO/tao/Pseudo_VarOut_T.inl +++ b/TAO/tao/Pseudo_VarOut_T.inl @@ -2,6 +2,8 @@ // // $Id$ +#include "tao/CORBA_methods.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL template <typename T> diff --git a/TAO/tao/RTScheduling/ThreadAction.h b/TAO/tao/RTScheduling/ThreadAction.h index 2087805741e..4c389996499 100644 --- a/TAO/tao/RTScheduling/ThreadAction.h +++ b/TAO/tao/RTScheduling/ThreadAction.h @@ -9,6 +9,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/RTScheduling/RTScheduler.h" +#include "tao/LocalObject.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h index 2340b044b2d..9e401de90a0 100644 --- a/TAO/tao/Seq_Out_T.h +++ b/TAO/tao/Seq_Out_T.h @@ -14,10 +14,14 @@ #define TAO_SEQ_OUT_T_H #include /**/ "ace/pre.h" +#include /**/ "tao/Versioned_Namespace.h" + #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ +#include "tao/Basic_Types.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h index 2ce9b8ad5f5..3ec1449d834 100644 --- a/TAO/tao/Seq_Var_T.h +++ b/TAO/tao/Seq_Var_T.h @@ -21,6 +21,8 @@ #include /**/ "tao/Versioned_Namespace.h" +#include "tao/Basic_Types.h" + TAO_BEGIN_VERSIONED_NAMESPACE_DECL /** diff --git a/TAO/tao/Special_Basic_Arguments.h b/TAO/tao/Special_Basic_Arguments.h index a2f40dd3f2d..961f3b2d328 100644 --- a/TAO/tao/Special_Basic_Arguments.h +++ b/TAO/tao/Special_Basic_Arguments.h @@ -25,6 +25,7 @@ #include "tao/Special_Basic_Argument_T.h" #include "tao/Arg_Traits_T.h" +#include "tao/Any_Insert_Policy_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h index 8c54f185a46..66f77ecb7b7 100644 --- a/TAO/tao/String_Sequence_Element_T.h +++ b/TAO/tao/String_Sequence_Element_T.h @@ -13,6 +13,8 @@ #include "tao/Basic_Types.h" +#include <algorithm> + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/TAO_Internal.h b/TAO/tao/TAO_Internal.h index 68daef75460..252a9c5e1bb 100644 --- a/TAO/tao/TAO_Internal.h +++ b/TAO/tao/TAO_Internal.h @@ -18,7 +18,6 @@ #include /**/ "ace/pre.h" #include "tao/orbconf.h" -#include /**/ "tao/Versioned_Namespace.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index 054dd55c96e..471cf4a3bef 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -17,6 +17,7 @@ #include /**/ "ace/pre.h" #include "tao/Argument.h" +#include "tao/CORBA_String.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Value_Traits_T.h b/TAO/tao/Value_Traits_T.h index cebe01f58dd..b68acfd7b63 100644 --- a/TAO/tao/Value_Traits_T.h +++ b/TAO/tao/Value_Traits_T.h @@ -11,6 +11,8 @@ * @author Carlos O'Ryan */ +#include /**/ "tao/Versioned_Namespace.h" + #include <algorithm> TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h index db3f3f57eb3..77d9edfc30d 100644 --- a/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h +++ b/TAO/tao/Valuetype/Bounded_Valuetype_Sequence_T.h @@ -14,6 +14,7 @@ #include "tao/Generic_Sequence_T.h" #include "Valuetype_Sequence_Element_T.h" #include "tao/MM_Sequence_Iterator_T.h" +#include "tao/Bounded_Reference_Allocation_Traits_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h index 1de231092ef..793df22deb8 100644 --- a/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h +++ b/TAO/tao/Valuetype/Unbounded_Valuetype_Sequence_T.h @@ -14,6 +14,7 @@ #include "tao/Generic_Sequence_T.h" #include "Valuetype_Sequence_Element_T.h" #include "tao/MM_Sequence_Iterator_T.h" +#include "tao/Unbounded_Reference_Allocation_Traits_T.h" TAO_BEGIN_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h index e9631236169..abe80d8ad5f 100644 --- a/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h +++ b/TAO/tao/Valuetype/Valuetype_Sequence_Element_T.h @@ -12,6 +12,8 @@ */ #include "tao/Basic_Types.h" +#include <algorithm> + TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h index fd48212b719..c1608cab33a 100644 --- a/TAO/tao/VarOut_T.h +++ b/TAO/tao/VarOut_T.h @@ -15,6 +15,8 @@ #include /**/ "ace/pre.h" +#include /**/ "tao/Versioned_Namespace.h" + #include "ace/OS_Memory.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index 1fa33d172fc..db9703c12a4 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -4,6 +4,7 @@ #define TAO_VAR_ARRAY_ARGUMENT_T_CPP #include "tao/Var_Array_Argument_T.h" +#include "tao/Array_Traits_T.h" #if !defined (__ACE_INLINE__) #include "tao/Var_Array_Argument_T.inl" diff --git a/TAO/tao/Var_Size_Argument_T.cpp b/TAO/tao/Var_Size_Argument_T.cpp index fed37deb700..a2616fff016 100644 --- a/TAO/tao/Var_Size_Argument_T.cpp +++ b/TAO/tao/Var_Size_Argument_T.cpp @@ -4,6 +4,7 @@ #define TAO_VAR_SIZE_ARGUMENT_T_CPP #include "tao/Var_Size_Argument_T.h" +#include "ace/OS_Memory.h" #if !defined (__ACE_INLINE__) #include "tao/Var_Size_Argument_T.inl" diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h index 35a7f8fef13..a294745cf9b 100644 --- a/TAO/tao/default_environment.h +++ b/TAO/tao/default_environment.h @@ -16,6 +16,7 @@ #include /**/ "ace/pre.h" #include /**/ "tao/TAO_Export.h" +#include /**/ "tao/Versioned_Namespace.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once |