Make use of ACE_FALLTHROUGH

14 files changed, 18 insertions, 18 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
index 5bad138dd40..639a59eb870 100644
--- a/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_argument/argument.cpp
@@ -153,7 +153,7 @@ be_visitor_args::gen_pd_arg (be_predefined_type *node,
   {
     case AST_PredefinedType::PT_any:
       *os << any_deref;
-      // fallthrough
+      ACE_FALLTHROUGH;
     case AST_PredefinedType::PT_pseudo:
     case AST_PredefinedType::PT_object:
       *os << lname << var_call;
diff --git a/TAO/TAO_IDL/narrow/narrow.cpp b/TAO/TAO_IDL/narrow/narrow.cpp
index c4e67c16404..60d4447e7ca 100644
--- a/TAO/TAO_IDL/narrow/narrow.cpp
+++ b/TAO/TAO_IDL/narrow/narrow.cpp
@@ -153,7 +153,7 @@ DeclAsScope (AST_Decl *d)
        * field and iterating
        */
       d = (dynamic_cast<AST_InterfaceFwd*> (d))->full_definition ();
-      // fallthrough
+      ACE_FALLTHROUGH;
     case AST_Decl::NT_interface:
       return dynamic_cast<AST_Interface*> (d);
     case AST_Decl::NT_valuetype:
diff --git a/TAO/examples/Quoter/Factory_Finder.cpp b/TAO/examples/Quoter/Factory_Finder.cpp
index d173ac60640..e6c22dccfd2 100644
--- a/TAO/examples/Quoter/Factory_Finder.cpp
+++ b/TAO/examples/Quoter/Factory_Finder.cpp
@@ -178,7 +178,7 @@ Quoter_Factory_Finder_Server::parse_args (void)
         ACE_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
         ACE_DEBUG ((LM_DEBUG,
                     "usage:  %s"
diff --git a/TAO/examples/Quoter/Generic_Factory.cpp b/TAO/examples/Quoter/Generic_Factory.cpp
index a56465d759a..c4a09c2923d 100644
--- a/TAO/examples/Quoter/Generic_Factory.cpp
+++ b/TAO/examples/Quoter/Generic_Factory.cpp
@@ -229,7 +229,7 @@ Quoter_Generic_Factory_Server::parse_args (void)
         ACE_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
         ACE_DEBUG ((LM_DEBUG,
                     "usage:  %s"
diff --git a/TAO/examples/Quoter/client.cpp b/TAO/examples/Quoter/client.cpp
index fe45683efc4..d1a5c03878b 100644
--- a/TAO/examples/Quoter/client.cpp
+++ b/TAO/examples/Quoter/client.cpp
@@ -60,7 +60,7 @@ Quoter_Client::parse_args (void)
         ACE_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     this->argv_[0], char(opt)));
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
         ACE_DEBUG ((LM_DEBUG,
                     "usage:  %s"
diff --git a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
index 2f23dbe7de1..afa7e326bea 100644
--- a/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/LifeCycle_Service.cpp
@@ -159,7 +159,7 @@ Life_Cycle_Service_Server::parse_args (int argc,
         ORBSVCS_ERROR ((LM_ERROR,
                     "%s: unknown arg, -%c\n",
                     argv[0], char(opt)));
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
         ORBSVCS_DEBUG ((LM_DEBUG,
                     ACE_TEXT("usage:  %s")
diff --git a/TAO/orbsvcs/Time_Service/Clerk_i.cpp b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
index 68a33d71963..f40c0085859 100644
--- a/TAO/orbsvcs/Time_Service/Clerk_i.cpp
+++ b/TAO/orbsvcs/Time_Service/Clerk_i.cpp
@@ -138,7 +138,7 @@ Clerk_i::parse_args (int argc,
        break;
 
       case '?':  // display help for use of the server.
-        /* FALLTHRU */
+        ACE_FALLTHROUGH;
       default:
         ORBSVCS_ERROR_RETURN ((LM_ERROR,
                            ACE_TEXT("[SERVER] Process/Thread Id : (%P/%t)")
diff --git a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
index e3ce8be3321..b9bd3c43792 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/FaultTolerant/FT_Naming_Server.cpp
@@ -559,9 +559,9 @@ TAO_FT_Naming_Server::parse_args (int argc,
               break;
             }
         }
-        // fallthrough
+        ACE_FALLTHROUGH;
       case '?':
-        // fallthrough
+        ACE_FALLTHROUGH;
       default:
         ORBSVCS_ERROR ((LM_ERROR,ACE_TEXT ("Unknown arg %c\n"), c ));
         ORBSVCS_ERROR_RETURN ((LM_ERROR,
diff --git a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
index 59e27d91b76..d6017c77eea 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Server.cpp
@@ -260,7 +260,7 @@ TAO_Naming_Server::parse_args (int argc,
         this->round_trip_timeout_ = (int)1.0e7 * ACE_OS::atoi (get_opts.opt_arg ());
         break;
       case '?':
-        // fallthrough
+        ACE_FALLTHROUGH;
       default:
 #if !defined (ACE_NLOGGING)
         const ACE_TCHAR *reqNonMinCorba=
diff --git a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
index a221db0de35..dacf841dea0 100644
--- a/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Property/CosPropertyService_i.cpp
@@ -1181,7 +1181,7 @@ TAO_PropertySetDef::define_property_with_mode (const char *property_name,
         {
           break;
         }
-      // fallthrough
+      ACE_FALLTHROUGH;
     default:
       // Error. ret is -1 or rebind returned other than 1.
       throw CORBA::UNKNOWN ();
diff --git a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
index feeff227a42..39213e5582f 100644
--- a/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
+++ b/TAO/orbsvcs/tests/EC_Multiple/EC_Multiple.cpp
@@ -263,7 +263,7 @@ Test_ECG::run (int argc, ACE_TCHAR* argv[])
         default:
           ACE_ERROR ((LM_WARNING, "Unknown scheduling type %d\n",
                       this->scheduling_type_));
-          /*FALLTHROUGH*/
+          ACE_FALLTHROUGH;
         case Test_ECG::ss_global:
           break;
 
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:
diff --git a/TAO/utils/logWalker/Log.cpp b/TAO/utils/logWalker/Log.cpp
index 5a602702aa9..abcb62328eb 100644
--- a/TAO/utils/logWalker/Log.cpp
+++ b/TAO/utils/logWalker/Log.cpp
@@ -151,7 +151,7 @@ Log::get_preamble ()
             if (this->procs_.get(first) == 0)
               first->proc_name(a2);
           }
-          //fallthru
+          ACE_FALLTHROUGH;
         default:
           {
             char ext[10];