diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-21 07:36:56 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-04-21 07:36:56 +0000 |
| commit | b30e8bb1417b04e76146a3be9207ffbf60552555 (patch) | |
| tree | 02b697d550d0612088cfcbe6b90abe190c7b7473 | |
| parent | ef7958fa85cb6dd4d985e0da3451c832c5f7c28a (diff) | |
| download | ATCD-b30e8bb1417b04e76146a3be9207ffbf60552555.tar.gz | |
ChangeLogTag: Thu Apr 20 19:27:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/CIAO/CIDLC/ServantSourceGenerator.cpp | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp index 29c8411f4db..316202aebcd 100644 --- a/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp +++ b/TAO/CIAO/CIDLC/ServantSourceGenerator.cpp @@ -1139,7 +1139,7 @@ namespace << "::Components::CCMHome_ptr h," << endl << "::CIAO::Session_Container *c," << endl << t.name () << "_Servant *sv)" << endl - << " : ACE_NESTED_CLASS (CIAO, Context_Impl_Base (h, c)), " << endl + << " : CIAO::Context_Impl_Base (h, c), " << endl << " ctx_svnt_base (h, c, sv)"; string swap_option = ctx.cl ().get_value ("custom-container", ""); @@ -2877,8 +2877,8 @@ namespace << "const char *ins_name," << endl << "::CIAO::Home_Servant_Impl_Base *hs," << endl << "::CIAO::Session_Container *c)" << endl - << " : ACE_NESTED_CLASS (CIAO, Servant_Impl_Base " - << "(h, hs, c))," << endl + << " : CIAO::Servant_Impl_Base " + << "(h, hs, c)," << endl << " comp_svnt_base (exe, h, hs, c)," << endl << " ins_name_ (ins_name)" << endl << "{" @@ -3979,7 +3979,7 @@ namespace << "_ptr exe," << endl << "const char *ins_name," << endl << "::CIAO::Session_Container *c)" << endl - << " : ACE_NESTED_CLASS (CIAO, Home_Servant_Impl_Base (c))," << endl + << " : CIAO::Home_Servant_Impl_Base (c)," << endl << " home_svnt_base (exe, c, ins_name"; string swap_option = ctx.cl ().get_value ("custom-container", ""); diff --git a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h index 918bc8ca6e6..758c3ea4e38 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h +++ b/TAO/orbsvcs/orbsvcs/Notify/ETCL_Filter.h @@ -158,7 +158,7 @@ private: /// A list of the constraints stored in this filter. typedef ACE_Hash_Map_Manager <CosNotifyFilter::ConstraintID, - ACE_NESTED_CLASS (TAO_Notify_ETCL_Filter, TAO_Notify_Constraint_Expr*), + TAO_Notify_ETCL_Filter::TAO_Notify_Constraint_Expr*, ACE_SYNCH_NULL_MUTEX> CONSTRAINT_EXPR_LIST; diff --git a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp index 4c44429d454..bd9d489dd63 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/EventTypeSeq.cpp @@ -31,7 +31,7 @@ TAO_Notify_EventTypeSeq::operator = (const TAO_Notify_EventTypeSeq & rhs) TAO_Notify_EventTypeSeq::TAO_Notify_EventTypeSeq (const TAO_Notify_EventTypeSeq & rhs) : TAO_Notify_Object () - , ACE_NESTED_CLASS (TAO_Notify,Topology_Savable ()) + , TAO_Notify::Topology_Savable () , ACE_Unbounded_Set <TAO_Notify_EventType> (rhs) , TAO_Notify::Topology_Object () { @@ -44,7 +44,7 @@ TAO_Notify_EventTypeSeq::populate (CosNotification::EventTypeSeq& event_type_seq inherited::CONST_ITERATOR iter (*this); - TAO_Notify_EventType* event_type; + TAO_Notify_EventType* event_type = 0; CORBA::ULong i = 0; for (iter.first (); iter.next (event_type); iter.advance (), ++i) |