diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-04-23 09:28:22 +0200 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-04-23 09:28:22 +0200 |
| commit | 73d0ce5aa15fcf0e27124fd4e9aa6e756e6bc9de (patch) | |
| tree | ac64443e33cf340f2dbb390de973cf42b2fa64c1 /TAO/tao | |
| parent | 17fc02df28233df6df48daa00f62a89b6629ef4b (diff) | |
| download | ATCD-73d0ce5aa15fcf0e27124fd4e9aa6e756e6bc9de.tar.gz | |
Make use of ACE_FALLTHROUGH
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/DynamicAny/DynAny_i.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Servant_Upcall.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp index 3506b030283..270b617167b 100644 --- a/TAO/tao/DynamicAny/DynAny_i.cpp +++ b/TAO/tao/DynamicAny/DynAny_i.cpp @@ -71,7 +71,7 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc) // Otherwise fall through. break; } - // fallthrough + ACE_FALLTHROUGH; default: throw DynamicAny::DynAnyFactory::InconsistentTypeCode (); } diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index e77ac5fb31a..db903e39819 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -241,7 +241,7 @@ namespace TAO // Unlock servant (if appropriate). this->single_threaded_poa_cleanup (); - /* FALLTHRU */ + ACE_FALLTHROUGH; case OBJECT_ADAPTER_LOCK_RELEASED: // Cleanup servant locator related state. Note that because @@ -265,7 +265,7 @@ namespace TAO // Cleanup servant related state. this->servant_cleanup (); - /* FALLTHRU */ + ACE_FALLTHROUGH; case POA_CURRENT_SETUP: // Cleanup POA related state. @@ -274,14 +274,14 @@ namespace TAO // Teardown current for this request. this->current_context_.teardown (); - /* FALLTHRU */ + ACE_FALLTHROUGH; case OBJECT_ADAPTER_LOCK_ACQUIRED: // Finally, since the object adapter lock was acquired, we must // release it. this->object_adapter_->lock ().release (); - /* FALLTHRU */ + ACE_FALLTHROUGH; case INITIAL_STAGE: default: |