summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-08 16:10:36 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-06-08 16:10:36 +0000
commit129e5b89c796bb9b6791448e7d18a6d88252b558 (patch)
tree0e42b07ad35976d6191020b227975d62e982348f
parent02af90ca70169e81c52c5f189cc18d1222437fd3 (diff)
downloadATCD-129e5b89c796bb9b6791448e7d18a6d88252b558.tar.gz
ChangeLogTag: Thu Jun 8 16:07:05 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/CIAO/ChangeLog8
-rw-r--r--TAO/CIAO/ciao/Servant_Impl_Utils_T.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 7129ed0e235..14b495a308b 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,3 +1,11 @@
+Thu Jun 8 16:07:05 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * ciao/Servant_Impl_Utils_T.cpp (describe_multiplex_receptacle):
+
+ Fixed an error in instantiation of a
+ Components::ConnectionDescription valuetype - the actual
+ constructor call should have been on the OBV_* subclass.
+
Thu Jun 8 12:29:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
* DAnCE/Planner/PCVisitor.cpp:
diff --git a/TAO/CIAO/ciao/Servant_Impl_Utils_T.cpp b/TAO/CIAO/ciao/Servant_Impl_Utils_T.cpp
index a23628c6d17..ba292da07ea 100644
--- a/TAO/CIAO/ciao/Servant_Impl_Utils_T.cpp
+++ b/TAO/CIAO/ciao/Servant_Impl_Utils_T.cpp
@@ -69,7 +69,7 @@ namespace CIAO
iter.advance (), ++map_slot)
{
ACE_NEW (conn,
- ::Components::ConnectionDescription);
+ ::OBV_Components::ConnectionDescription);
::Components::ConnectionDescription_var safe_conn = conn;
::Components::Cookie *cookie_from_key = 0;