diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-29 19:28:04 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2007-01-29 19:28:04 +0000 |
| commit | 5474cf1ce3403822b661fca644a00508f66a3a4b (patch) | |
| tree | 17746b89c0ee788cab0fc08f72cd36e55b7142c4 | |
| parent | 33da10f7600f11c8084be497e4f44e4c27c5001d (diff) | |
| download | ATCD-5474cf1ce3403822b661fca644a00508f66a3a4b.tar.gz | |
Mon Jan 29 19:27:14 2007 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index aa64c85df66..3ee533226e0 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Mon Jan 29 19:27:14 2007 Johnny Willemsen <jwillemsen@remedy.nl> + + * orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp: + Removed not needed return statements after ACE_THROW_RETURN, fixes + warnings with HP aCC on IA64 + Mon Jan 29 19:11:14 2007 Johnny Willemsen <jwillemsen@remedy.nl> * tao/Adapter_Registry.cpp: diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index f47602374e1..6bc0926361b 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -182,8 +182,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (void) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); - - return CosNotifyFilter::MappingFilter::_nil (); } template <class SERVANT_TYPE> void @@ -203,8 +201,6 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (void) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); - - return CosNotifyFilter::MappingFilter::_nil (); } template <class SERVANT_TYPE> void |