diff options
-rw-r--r-- | TAO/ChangeLog | 25 | ||||
-rw-r--r-- | TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp | 17 | ||||
-rw-r--r-- | TAO/tao/BiDir_GIOP/BiDir_Policy_i.h | 4 | ||||
-rw-r--r-- | TAO/tao/Buffering_Constraint_Policy.cpp | 19 | ||||
-rw-r--r-- | TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp | 16 | ||||
-rw-r--r-- | TAO/tao/Messaging/Messaging_Policy_i.cpp | 32 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Servant_Base.cpp | 15 | ||||
-rw-r--r-- | TAO/tao/RTCORBA/RT_Policy_i.cpp | 98 |
8 files changed, 167 insertions, 59 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a950bd18c86..628259b8fc9 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,22 @@ +Wed Jun 11 11:44:21 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> + + * tao/Buffering_Constraint_Policy.cpp: + * tao/BiDir_GIOP/BiDir_Policy_i.cpp: + * tao/BiDir_GIOP/BiDir_Policy_i.h: + * tao/Messaging/Connection_Timeout_Policy_i.cpp: + * tao/Messaging/Messaging_Policy_i.cpp: + * tao/PortableServer/Servant_Base.cpp: + * tao/RTCORBA/RT_Policy_i.cpp: First set of fixes for gcc + 3.3. These are all related to the order of base class + construction which has virtual inheritance. gcc 3.3 is + particularly picky about this emitting up lots of warnings. What + makes this particularly tricky is that gcc 3.3 is a bit + inconsistent emitting warnings for only copy constructors. But + that is besides the point. + + The fixes made are also for regular constructors and so they + should just work fine. + Wed Jun 11 11:45:47 2003 Jeff Parsons <j.parsons@vanderbilt.edu> * orbsvcs/orbsvcs/IFRService/IFR_Service_Utils_T.cpp(set_is_multiple): @@ -38,12 +57,12 @@ Tue Jun 10 10:05:34 2003 Jeff Parsons <j.parsons@vanderbilt.edu> Tue Jun 10 09:33:41 2003 Jeff Parsons <j.parsons@vanderbilt.edu> - * orbsvcs\orbsvcs\IFRService\ComponentDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/ComponentDef_i.cpp: Cosmetic changes. - * orbsvcs\orbsvcs\IFRService\HomeDef_i.cpp: - * orbsvcs\orbsvcs\IFRService\tmplinst.cpp: + * orbsvcs/orbsvcs/IFRService/HomeDef_i.cpp: + * orbsvcs/orbsvcs/IFRService/tmplinst.cpp: Added a specialization for the TAO_IFR_Desc_Utils<>::fill_desc_begin_ex() method when the diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp index a263b0920b5..9e71858580d 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.cpp @@ -14,19 +14,26 @@ ACE_RCSID(TAO, BiDir_Policy_i, "$Id$") TAO_BidirectionalPolicy::TAO_BidirectionalPolicy ( const BiDirPolicy::BidirectionalPolicyValue val) - : value_ (val) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , BiDirPolicy::BidirectionalPolicy () + , TAO_Local_RefCounted_Object () + , value_ (val) { } TAO_BidirectionalPolicy::TAO_BidirectionalPolicy (const TAO_BidirectionalPolicy &rhs) - : BiDirPolicy::BidirectionalPolicy (), - TAO_Local_RefCounted_Object (), - value_ (rhs.value_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , BiDirPolicy::BidirectionalPolicy () + , TAO_Local_RefCounted_Object () + , value_ (rhs.value_) { } - CORBA::PolicyType TAO_BidirectionalPolicy::policy_type (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) diff --git a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h index f0525ea7fab..3da4c518882 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h +++ b/TAO/tao/BiDir_GIOP/BiDir_Policy_i.h @@ -46,8 +46,8 @@ */ class TAO_BiDirGIOP_Export TAO_BidirectionalPolicy - : public BiDirPolicy::BidirectionalPolicy, - public TAO_Local_RefCounted_Object + : public virtual BiDirPolicy::BidirectionalPolicy, + public virtual TAO_Local_RefCounted_Object { public: diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp index 24d0b3812f1..a9d8bf9bd44 100644 --- a/TAO/tao/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Buffering_Constraint_Policy.cpp @@ -12,16 +12,23 @@ ACE_RCSID(TAO, Buffering_Constraint_Policy, "$Id$") #endif /* __ACE_INLINE__ */ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::BufferingConstraint &buffering_constraint) - : TAO::BufferingConstraintPolicy (), - TAO_Local_RefCounted_Object (), - buffering_constraint_ (buffering_constraint) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , TAO::BufferingConstraintPolicy () + , TAO_Local_RefCounted_Object () + , buffering_constraint_ (buffering_constraint) { } TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs) - : TAO::BufferingConstraintPolicy (), - TAO_Local_RefCounted_Object (), - buffering_constraint_ (rhs.buffering_constraint_) + + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , TAO::BufferingConstraintPolicy () + , TAO_Local_RefCounted_Object () + , buffering_constraint_ (rhs.buffering_constraint_) { } diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index d3881e46707..3251c8c4037 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -11,15 +11,23 @@ ACE_RCSID (Messaging, TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( const TimeBase::TimeT& relative_expiry) - : relative_expiry_ (relative_expiry) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , TAO::ConnectionTimeoutPolicy () + , TAO_Local_RefCounted_Object () + , relative_expiry_ (relative_expiry) { } TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( const TAO_ConnectionTimeoutPolicy &rhs) - : TAO::ConnectionTimeoutPolicy (), - TAO_Local_RefCounted_Object (), - relative_expiry_ (rhs.relative_expiry_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , TAO::ConnectionTimeoutPolicy () + , TAO_Local_RefCounted_Object () + , relative_expiry_ (rhs.relative_expiry_) { } diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index cb44c2c2a6c..13b11e8c1ae 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -16,15 +16,23 @@ ACE_RCSID (Messaging, TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( const TimeBase::TimeT& relative_expiry) - : relative_expiry_ (relative_expiry) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , Messaging::RelativeRoundtripTimeoutPolicy () + , TAO_Local_RefCounted_Object () + , relative_expiry_ (relative_expiry) { } TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( const TAO_RelativeRoundtripTimeoutPolicy &rhs) - : Messaging::RelativeRoundtripTimeoutPolicy (), - TAO_Local_RefCounted_Object (), - relative_expiry_ (rhs.relative_expiry_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , Messaging::RelativeRoundtripTimeoutPolicy () + , TAO_Local_RefCounted_Object () + , relative_expiry_ (rhs.relative_expiry_) { } @@ -177,14 +185,22 @@ TAO_RelativeRoundtripTimeoutPolicy::set_time_value (ACE_Time_Value &time_value) #if (TAO_HAS_SYNC_SCOPE_POLICY == 1) TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronization) - : synchronization_ (synchronization) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , Messaging::SyncScopePolicy () + , TAO_Local_RefCounted_Object () + , synchronization_ (synchronization) { } TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) - : Messaging::SyncScopePolicy (), - TAO_Local_RefCounted_Object (), - synchronization_ (rhs.synchronization_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , Messaging::SyncScopePolicy () + , TAO_Local_RefCounted_Object () + , synchronization_ (rhs.synchronization_) { } diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index b29e45af47a..c1b02827c15 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -43,12 +43,14 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Servant_Base_Timeprobe_Description, #endif /* ACE_ENABLE_TIMEPROBES */ TAO_ServantBase::TAO_ServantBase (void) - : optable_ (0) + : TAO_Abstract_ServantBase () + , optable_ (0) { } TAO_ServantBase::TAO_ServantBase (const TAO_ServantBase &rhs) - : optable_ (rhs.optable_) + : TAO_Abstract_ServantBase () + , optable_ (rhs.optable_) { } @@ -372,14 +374,18 @@ TAO_RefCountServantBase::_ref_count (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) const } TAO_RefCountServantBase::TAO_RefCountServantBase (void) - : ref_count_ (1) + : TAO_Abstract_ServantBase () + , TAO_ServantBase () + , ref_count_ (1) { } TAO_RefCountServantBase::TAO_RefCountServantBase ( const TAO_RefCountServantBase & ) - : ref_count_ (1) + : TAO_Abstract_ServantBase () + , TAO_ServantBase () + , ref_count_ (1) { } @@ -495,4 +501,3 @@ TAO_Local_ServantBase::_dispatch (TAO_ServerRequest &, { ACE_THROW (CORBA::BAD_OPERATION ()); } - diff --git a/TAO/tao/RTCORBA/RT_Policy_i.cpp b/TAO/tao/RTCORBA/RT_Policy_i.cpp index 7252ad27b32..8261169e8e5 100644 --- a/TAO/tao/RTCORBA/RT_Policy_i.cpp +++ b/TAO/tao/RTCORBA/RT_Policy_i.cpp @@ -17,16 +17,24 @@ ACE_RCSID (TAO, TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (RTCORBA::PriorityModel priority_model, RTCORBA::Priority server_priority) - : priority_model_ (priority_model), - server_priority_ (server_priority) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::PriorityModelPolicy () + , TAO_Local_RefCounted_Object () + , priority_model_ (priority_model) + , server_priority_ (server_priority) { } TAO_PriorityModelPolicy::TAO_PriorityModelPolicy (const TAO_PriorityModelPolicy &rhs) - : RTCORBA::PriorityModelPolicy (), - TAO_Local_RefCounted_Object (), - priority_model_ (rhs.priority_model_), - server_priority_ (rhs.server_priority_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::PriorityModelPolicy () + , TAO_Local_RefCounted_Object () + , priority_model_ (rhs.priority_model_) + , server_priority_ (rhs.server_priority_) { } @@ -139,14 +147,22 @@ TAO_PriorityModelPolicy::_tao_scope (void) const // **************************************************************** TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (RTCORBA::ThreadpoolId id) - : id_ (id) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::ThreadpoolPolicy () + , TAO_Local_RefCounted_Object () + , id_ (id) { } TAO_ThreadpoolPolicy::TAO_ThreadpoolPolicy (const TAO_ThreadpoolPolicy &rhs) - : RTCORBA::ThreadpoolPolicy (), - TAO_Local_RefCounted_Object (), - id_ (rhs.id_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::ThreadpoolPolicy () + , TAO_Local_RefCounted_Object () + , id_ (rhs.id_) { } @@ -224,12 +240,20 @@ TAO_ThreadpoolPolicy::_tao_scope (void) const // **************************************************************** TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (void) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::PrivateConnectionPolicy () + , TAO_Local_RefCounted_Object () { } TAO_PrivateConnectionPolicy::TAO_PrivateConnectionPolicy (const TAO_PrivateConnectionPolicy &) - : RTCORBA::PrivateConnectionPolicy (), - TAO_Local_RefCounted_Object () + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::PrivateConnectionPolicy () + , TAO_Local_RefCounted_Object () { } @@ -296,14 +320,22 @@ TAO_PrivateConnectionPolicy::_tao_scope (void) const // **************************************************************** TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const RTCORBA::PriorityBands &bands) - : priority_bands_ (bands) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::PriorityBandedConnectionPolicy () + , TAO_Local_RefCounted_Object () + , priority_bands_ (bands) { } TAO_PriorityBandedConnectionPolicy::TAO_PriorityBandedConnectionPolicy (const TAO_PriorityBandedConnectionPolicy &rhs) - : RTCORBA::PriorityBandedConnectionPolicy (), - TAO_Local_RefCounted_Object (), - priority_bands_ (rhs.priority_bands_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::PriorityBandedConnectionPolicy () + , TAO_Local_RefCounted_Object () + , priority_bands_ (rhs.priority_bands_) { } @@ -410,14 +442,22 @@ TAO_PriorityBandedConnectionPolicy::priority_bands_rep (void) // **************************************************************** TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const RTCORBA::ProtocolList &protocols) - : protocols_ (protocols) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::ServerProtocolPolicy () + , TAO_Local_RefCounted_Object () + , protocols_ (protocols) { } TAO_ServerProtocolPolicy::TAO_ServerProtocolPolicy (const TAO_ServerProtocolPolicy &rhs) - : RTCORBA::ServerProtocolPolicy (), - TAO_Local_RefCounted_Object (), - protocols_ (rhs.protocols_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::ServerProtocolPolicy () + , TAO_Local_RefCounted_Object () + , protocols_ (rhs.protocols_) { } @@ -687,16 +727,22 @@ TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (void) TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const RTCORBA::ProtocolList &protocols) - : RTCORBA::ClientProtocolPolicy (), - TAO_Local_RefCounted_Object (), - protocols_ (protocols) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::ClientProtocolPolicy () + , TAO_Local_RefCounted_Object () + , protocols_ (protocols) { } TAO_ClientProtocolPolicy::TAO_ClientProtocolPolicy (const TAO_ClientProtocolPolicy &rhs) - : RTCORBA::ClientProtocolPolicy (), - TAO_Local_RefCounted_Object (), - protocols_ (rhs.protocols_) + : ACE_NESTED_CLASS (CORBA, Object) () + , ACE_NESTED_CLASS (CORBA, Policy) () + , ACE_NESTED_CLASS (CORBA, LocalObject) () + , RTCORBA::ClientProtocolPolicy () + , TAO_Local_RefCounted_Object () + , protocols_ (rhs.protocols_) { } |