diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-03-22 14:40:19 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-03-22 14:40:19 +0000 |
| commit | c212602d23d1cfde56763665c044299a8d4ea573 (patch) | |
| tree | b282f1f02f395b9308a642333db12c0b8fb480f8 | |
| parent | c85837279e1577d4aa91da5fcfbac8fec917b61d (diff) | |
| download | ATCD-c212602d23d1cfde56763665c044299a8d4ea573.tar.gz | |
ChangeLogTag: Wed Mar 22 14:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/ChangeLog | 5 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4533206b3c0..c7ddb527d90 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,8 @@ +Wed Mar 22 14:35:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/GIOP_Message_Base.cpp: + Fixed "control reaches end of non-void function" warning + Tue Mar 21 13:01:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl> * tao/ORB_Table.h: diff --git a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp index 7cc9cca3e91..622acba3277 100644 --- a/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp +++ b/TAO/orbsvcs/orbsvcs/Notify/ProxySupplier_T.cpp @@ -189,7 +189,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::priority_filter (ACE_ENV_SINGLE_ARG_DE ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); - //return CosNotifyFilter::MappingFilter::_nil (); + return CosNotifyFilter::MappingFilter::_nil (); } template <class SERVANT_TYPE> void @@ -210,7 +210,7 @@ TAO_Notify_ProxySupplier_T<SERVANT_TYPE>::lifetime_filter (ACE_ENV_SINGLE_ARG_DE ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CosNotifyFilter::MappingFilter::_nil ()); - //return CosNotifyFilter::MappingFilter::_nil (); + return CosNotifyFilter::MappingFilter::_nil (); } template <class SERVANT_TYPE> void diff --git a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp index 20202ad3e8e..bb942c91fe5 100644 --- a/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp +++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_Interfaces.cpp @@ -1891,7 +1891,7 @@ export_proxy (CosTrading::Lookup_ptr, { ACE_THROW_RETURN (CORBA::UNKNOWN (), 0); - //return 0; + return 0; } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> @@ -1919,7 +1919,7 @@ describe_proxy (const char * { ACE_THROW_RETURN (CORBA::UNKNOWN (), 0); - //return 0; + return 0; } template <class TRADER_LOCK_TYPE, class MAP_LOCK_TYPE> |