diff options
| author | elliott_c <ocielliottc@users.noreply.github.com> | 2004-12-21 15:52:41 +0000 |
|---|---|---|
| committer | elliott_c <ocielliottc@users.noreply.github.com> | 2004-12-21 15:52:41 +0000 |
| commit | eafe9373008fdef0c7c3db6e5027e0b10253acd2 (patch) | |
| tree | b86dc58b4e892f25e53f60561b8d913856a54519 | |
| parent | 33014fdd9f1c775c7494c9e051dd5c1714972d29 (diff) | |
| download | ATCD-eafe9373008fdef0c7c3db6e5027e0b10253acd2.tar.gz | |
ChangeLogTag: Tue Dec 21 09:49:50 2004 Chad Elliott <elliott_c@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 9 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp | 1 |
3 files changed, 11 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 37896bdfe06..bbc8a311d01 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,12 @@ +Tue Dec 21 09:49:50 2004 Chad Elliott <elliott_c@ociweb.com> + + * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp: + * orbsvcs/orbsvcs/Notify/Topology_Object.cpp: + + My previous change broke the Borland build. I have spread the + initialization to, hopefully, the right places to make all + compilers happy. + Tue Dec 21 06:41:23 2004 Chad Elliott <elliott_c@ociweb.com> * orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index 9429ef6a3d4..7ca6309f03f 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -33,9 +33,7 @@ TAO_Notify_EventTypeSeq::operator = (const TAO_Notify_EventTypeSeq & rhs) } TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs) - : TAO_Notify_Object () - , Topology_Savable () - , ACE_Unbounded_Set <TAO_Notify_EventType> (rhs) + : ACE_Unbounded_Set <TAO_Notify_EventType> (rhs) , TAO_Notify::Topology_Object () { } diff --git a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp index 46afcb3bc62..6a805abb2b9 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/Topology_Object.cpp @@ -22,6 +22,7 @@ namespace TAO_Notify Topology_Object::Topology_Object () : TAO_Notify_Object () + , Topology_Savable () , self_changed_ (false) , children_changed_ (false) , topology_parent_ (0) |