summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2004-12-23 14:45:38 +0000
committerbala <balanatarajan@users.noreply.github.com>2004-12-23 14:45:38 +0000
commitf71b212ef801b64589fca0f4441cf52ed4f4920e (patch)
tree3da8dab2ff79b4aad47b08c002dbff1d83a9010e
parent50f028d1a287a2360578a070e460d694e94dd11d (diff)
downloadATCD-f71b212ef801b64589fca0f4441cf52ed4f4920e.tar.gz
ChangeLogTag:Thu Dec 23 14:44:36 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp4
2 files changed, 10 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 814ca52a631..de5f1a8b301 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Thu Dec 23 14:44:36 2004 Balachandran Natarajan <bala@dre.vanderbilt.edu>
+
+ * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp:
+
+ A more portable fix for warnings, errors and other compiler
+ oddities.
+
Wed Dec 22 11:38:23 2004 Trevor Fields <fields_t@ociweb.com>
* orbsvcs/tests/AVStreams/Full_Profile/run_test.pl:
diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
index 7ca6309f03f..d72f8df40e7 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp
@@ -33,7 +33,9 @@ TAO_Notify_EventTypeSeq::operator = (const TAO_Notify_EventTypeSeq & rhs)
}
TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs)
- : ACE_Unbounded_Set <TAO_Notify_EventType> (rhs)
+ : TAO_Notify_Object ()
+ , ACE_NESTED_CLASS (TAO_Notify,Topology_Savable ())
+ , ACE_Unbounded_Set <TAO_Notify_EventType> (rhs)
, TAO_Notify::Topology_Object ()
{
}