summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-10-22 21:45:53 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-10-22 21:45:53 +0000
commit48ea098da24d1c003a7cab28b4a3d02602f84a96 (patch)
treeba08d689654f0dd5a519d2642c713e42e1023224
parent0b84dc03a1d226b3d5edb9546116f66d041dbb19 (diff)
downloadATCD-48ea098da24d1c003a7cab28b4a3d02602f84a96.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-99c3
-rw-r--r--TAO/tao/Buffering_Constraint_Policy.cpp4
-rw-r--r--TAO/tao/Client_Priority_Policy.cpp4
-rw-r--r--TAO/tao/Messaging_Policy_i.cpp8
4 files changed, 14 insertions, 5 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 62541123cb5..06b1c3e91f2 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -6,7 +6,8 @@ Fri Oct 22 12:39:29 1999 Irfan Pyarali <irfan@cs.wustl.edu>
* tao/Client_Priority_Policy.cpp (TAO_Client_Priority_Policy):
Added explicit copy constructors because SUN CC 5.0 won't
- compile without them.
+ compile without them. One addition: base class constructors
+ should be explicitly initialized in the copy constructor.
Thu Oct 21 14:55:02 1999 Darrell Brunsch <brunsch@cs.wustl.edu>
diff --git a/TAO/tao/Buffering_Constraint_Policy.cpp b/TAO/tao/Buffering_Constraint_Policy.cpp
index 93a30ac5f5e..d4b6aab6cfe 100644
--- a/TAO/tao/Buffering_Constraint_Policy.cpp
+++ b/TAO/tao/Buffering_Constraint_Policy.cpp
@@ -18,7 +18,9 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO::Buf
}
TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buffering_Constraint_Policy &rhs)
- : buffering_constraint_ (rhs.buffering_constraint_),
+ : PortableServer::RefCountServantBase (rhs),
+ POA_TAO::BufferingConstraintPolicy (rhs),
+ buffering_constraint_ (rhs.buffering_constraint_),
poa_ (rhs.poa_)
{
}
diff --git a/TAO/tao/Client_Priority_Policy.cpp b/TAO/tao/Client_Priority_Policy.cpp
index ce2d75cf771..83ca8856aab 100644
--- a/TAO/tao/Client_Priority_Policy.cpp
+++ b/TAO/tao/Client_Priority_Policy.cpp
@@ -19,7 +19,9 @@ TAO_Client_Priority_Policy::TAO_Client_Priority_Policy (
}
TAO_Client_Priority_Policy::TAO_Client_Priority_Policy (const TAO_Client_Priority_Policy &rhs)
- : poa_ (rhs.poa_),
+ : PortableServer::RefCountServantBase (rhs),
+ POA_TAO::ClientPriorityPolicy (rhs),
+ poa_ (rhs.poa_),
priority_spec_ (rhs.priority_spec_)
{
}
diff --git a/TAO/tao/Messaging_Policy_i.cpp b/TAO/tao/Messaging_Policy_i.cpp
index 275a4230c96..abe3a5ff02d 100644
--- a/TAO/tao/Messaging_Policy_i.cpp
+++ b/TAO/tao/Messaging_Policy_i.cpp
@@ -19,7 +19,9 @@ TAO_RelativeRoundtripTimeoutPolicy_i::TAO_RelativeRoundtripTimeoutPolicy_i (
}
TAO_RelativeRoundtripTimeoutPolicy_i::TAO_RelativeRoundtripTimeoutPolicy_i (const TAO_RelativeRoundtripTimeoutPolicy_i &rhs)
- : poa_ (rhs.poa_),
+ : PortableServer::RefCountServantBase (rhs),
+ POA_Messaging::RelativeRoundtripTimeoutPolicy (rhs),
+ poa_ (rhs.poa_),
relative_expiry_ (rhs.relative_expiry_)
{
}
@@ -135,7 +137,9 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (Messaging::SyncScope synchronizati
}
TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs)
- : synchronization_ (rhs.synchronization_),
+ : PortableServer::RefCountServantBase (rhs),
+ POA_Messaging::SyncScopePolicy (rhs),
+ synchronization_ (rhs.synchronization_),
poa_ (rhs.poa_)
{
}