diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-07-31 01:31:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-07-31 01:31:30 +0000 |
| commit | 5f73c8944315a8b78a005c0cbb4b30ec5a822f1e (patch) | |
| tree | 764a1c616734158502a496e73b4c115c86e58f4c | |
| parent | dd1ab61781d62f9344c805fdf74a7f6c441ce5c8 (diff) | |
| download | ATCD-5f73c8944315a8b78a005c0cbb4b30ec5a822f1e.tar.gz | |
ChangeLogTag:Fri Jul 30 18:29:54 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/CIAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/CIAO/ciao/Servant_Impl_T.cpp | 48 |
2 files changed, 32 insertions, 24 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 65b4aaca2a4..f4efaabd0d1 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,11 @@ +Fri Jul 30 18:29:54 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * ciao/Servant_Impl_T.cpp (get_all_facets, get_all_consumers): + + Fixed another instance of incorrect emulated exception + parameter. The method definition incorrectly used a default + parameter. + Fri Jul 30 17:29:18 2004 Ossama Othman <ossama@dre.vanderbilt.edu> * NEWS: Added CIAO 0.4.2 noteworthy items. diff --git a/TAO/CIAO/ciao/Servant_Impl_T.cpp b/TAO/CIAO/ciao/Servant_Impl_T.cpp index 9fe130edd33..443aab29064 100644 --- a/TAO/CIAO/ciao/Servant_Impl_T.cpp +++ b/TAO/CIAO/ciao/Servant_Impl_T.cpp @@ -7,34 +7,34 @@ namespace CIAO { - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, + template <typename BASE_SKEL, + typename EXEC, + typename EXEC_VAR, typename CONTEXT> Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::Servant_Impl ( - EXEC * exe, + EXEC * exe, Session_Container * c ) : Servant_Impl_Base (c), executor_ (EXEC::_duplicate (exe)) { } - - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, + + template <typename BASE_SKEL, + typename EXEC, + typename EXEC_VAR, typename CONTEXT> Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::~Servant_Impl (void) { } - - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, + + template <typename BASE_SKEL, + typename EXEC, + typename EXEC_VAR, typename CONTEXT> ::Components::FacetDescriptions * Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_facets ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -42,12 +42,12 @@ namespace CIAO ACE_NEW_RETURN (tmp, ::Components::FacetDescriptions, 0); - + ::Components::FacetDescriptions_var retval = tmp; retval->length (this->facet_table_.current_size ()); CORBA::ULong i = 0; - + for (FacetTable::iterator iter = this->facet_table_.begin (); iter != this->facet_table_.end (); ++iter, ++i) @@ -55,17 +55,17 @@ namespace CIAO FacetTable::ENTRY & entry = *iter; retval[i] = entry.int_id_; } - + return retval._retn (); } - - template <typename BASE_SKEL, - typename EXEC, - typename EXEC_VAR, + + template <typename BASE_SKEL, + typename EXEC, + typename EXEC_VAR, typename CONTEXT> ::Components::ConsumerDescriptions * Servant_Impl<BASE_SKEL, EXEC, EXEC_VAR, CONTEXT>::get_all_consumers ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS + ACE_ENV_SINGLE_ARG_DECL_NOT_USED ) ACE_THROW_SPEC ((CORBA::SystemException)) { @@ -73,12 +73,12 @@ namespace CIAO ACE_NEW_RETURN (tmp, ::Components::ConsumerDescriptions, 0); - + ::Components::ConsumerDescriptions_var retval = tmp; retval->length (this->consumer_table_.current_size ()); CORBA::ULong i = 0; - + for (ConsumerTable::iterator iter = this->consumer_table_.begin (); iter != this->consumer_table_.end (); ++iter, ++i) @@ -86,7 +86,7 @@ namespace CIAO ConsumerTable::ENTRY & entry = *iter; retval[i] = entry.int_id_; } - + return retval._retn (); } } |