Merge pull request #2364 from mitza-oci/a6t2-tao_idl-warnings

[ACE 6_TAO 2] fixed warnings

Author: mitza-oci

ACE/ACEXML/common/HttpCharStream.cpp

@@ -346,7 +346,7 @@ ACEXML_HttpCharStream::determine_encoding (void)
 
   size_t i = 0;
   for (; i < len && input[i] != static_cast<char> (EOF); ++i)
-    input[i] = this->stream_->peek_char (i);
+    input[i] = static_cast<char> (this->stream_->peek_char (i));
 
   if (i < len)
     return -1;

ACE/ACEXML/common/Transcode.cpp

@@ -40,9 +40,9 @@ ACEXML_Transcoder::utf162utf8 (ACEXML_UTF16 src,
       if (src >= 0xD800 && src < 0xE000)
         return ACEXML_IS_SURROGATE;
 
-      *dst = 0xe0 | (static_cast<ACEXML_UTF8> (src) / 0x1000);
-      *(dst+1) = 0x80 | ((static_cast<ACEXML_UTF8> (src) % 0x1000) / 0x40);
-      *(dst+2) = 0x80 | (static_cast<ACEXML_UTF8> (src) % 0x40);
+      *dst = static_cast<ACEXML_UTF8> (0xe0 | (src / 0x1000));
+      *(dst+1) = static_cast<ACEXML_UTF8> (0x80 | (src % 0x1000 / 0x40));
+      *(dst+2) = static_cast<ACEXML_UTF8> (0x80 | (src % 0x40));
       return 3;
     }
 }
@@ -67,10 +67,10 @@ ACEXML_Transcoder::ucs42utf8 (ACEXML_UCS4 src,
       if (dst == 0)
         return ACEXML_INVALID_ARGS;
 
-      *dst = 0xf0 | (static_cast<ACEXML_UTF8> (src / 0x40000));
-      *(dst+1) = 0x80 | ((static_cast<ACEXML_UTF8> (src % 0x40000)) / 0x1000);
-      *(dst+2) = 0x80 | ((static_cast<ACEXML_UTF8> (src % 0x1000)) / 0x40);
-      *(dst+3) = 0x80 | (static_cast<ACEXML_UTF8> (src % 0x40));
+      *dst = static_cast<ACEXML_UTF8> (0xf0 | (src / 0x40000));
+      *(dst+1) = static_cast<ACEXML_UTF8> (0x80 | (src % 0x40000 / 0x1000));
+      *(dst+2) = static_cast<ACEXML_UTF8> (0x80 | (src % 0x1000 / 0x40));
+      *(dst+3) = static_cast<ACEXML_UTF8> (0x80 | (src % 0x40));
       return 4;
     }
   return ACEXML_NON_UNICODE;

TAO/TAO_IDL/be/be_codegen.cpp

@@ -848,9 +848,9 @@ TAO_CodeGen::start_anyop_header (const char *fname)
         {
           char* idl_name = idl_global->included_idl_files ()[j];
 
-          ACE_CString pidl_checker (idl_name);
+          ACE_CString const pidl_checker_included (idl_name);
           bool const got_pidl =
-            (pidl_checker.substr (pidl_checker.length () - 5) == ".pidl");
+            (pidl_checker_included.substr (pidl_checker_included.length () - 5) == ".pidl");
 
           // If we're here and we have a .pidl file, we need to generate
           // the *A.h include, if it is not a .pidl file we don't generate

TAO/TAO_IDL/be/be_visitor_ami_pre_proc.cpp

@@ -528,18 +528,18 @@ be_visitor_ami_pre_proc::create_sendc_operation (be_operation *node)
               original_arg->direction () == AST_Argument::dir_INOUT)
             {
               // Create the argument.
-              be_argument *arg = 0;
+              be_argument *arg_new = 0;
               UTL_ScopedName *new_name =
                 (UTL_ScopedName *)original_arg->name ()->copy ();
-              ACE_NEW_RETURN (arg,
+              ACE_NEW_RETURN (arg_new,
                               be_argument (AST_Argument::dir_IN,
                                            original_arg->field_type (),
                                            new_name),
                               0);
 
-              arg->set_defined_in (op);
-              arg->set_name (new_name);
-              op->be_add_argument (arg);
+              arg_new->set_defined_in (op);
+              arg_new->set_name (new_name);
+              op->be_add_argument (arg_new);
             }
         } // end of while loop
     } // end of if

TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp

@@ -49,21 +49,21 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node)
        i.next ())
     {
       AST_Decl *d = i.item ();
-      AST_Provides *p = dynamic_cast<AST_Provides*> (d);
+      AST_Provides *const provides = dynamic_cast<AST_Provides*> (d);
 
-      if (p != 0)
+      if (provides)
         {
           if (first)
             {
              os_  << ": facet_exec_" << port_nr << "_ (new ";
-             os_ << p->provides_type ()->local_name ();
+             os_ << provides->provides_type ()->local_name ();
              os_ << suffix << " ())" << be_nl;
              first = false;
             }
           else
             {
              os_  << ", facet_exec_" << port_nr << "_ (new ";
-             os_ << p->provides_type ()->local_name ();
+             os_ << provides->provides_type ()->local_name ();
              os_ << suffix << " ())" << be_uidt_nl;
             }
           port_nr++;

TAO/TAO_IDL/be/be_visitor_constant/constant.cpp

@@ -45,6 +45,4 @@ const char *exprtype_to_cpp_corba_type (AST_Expression::ExprType et)
     default:
       return 0;
     }
-
-  return 0;
 }

TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp

@@ -140,9 +140,8 @@ be_facet_op_attr_defn_helper::emit (be_interface * /* derived_interface */,
        i.next ())
     {
       AST_Decl *d = i.item ();
-      AST_Decl::NodeType nt = d->node_type ();
 
-      switch (nt)
+      switch (d->node_type ())
         {
           case AST_Decl::NT_op:
             {

TAO/TAO_IDL/be/be_visitor_native/native_ch.cpp

@@ -66,7 +66,6 @@ be_visitor_native_ch::visit_native (be_native *node)
       // DDS/DCPS zero-copy read sequence type support.
 
       // strip  the "Seq" ending to get the sample's name
-      const char * node_name = node->full_name ();
       const size_t max_name_length = 2000;
       const size_t node_name_length = ACE_OS::strlen (node_name);
       if (node_name_length >= max_name_length ||

TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp

@@ -201,17 +201,13 @@ be_visitor_typedef_ch::visit_array (be_array *node)
       // we can have only one call to it from any instantiation per stream
       // output statement.
 
-      const char *static_decl = "";
-      AST_Module *scope = dynamic_cast<AST_Module*> (tdef->defined_in ());
+      AST_Module *tdef_scope = dynamic_cast<AST_Module *> (tdef->defined_in ());
 
       // If the typedef is not declared globally or in a module, the
       // associated array memory management function must be static.
-      if (scope == 0)
-        {
-          static_decl = "static ";
-        }
+      char const *const static_decl = tdef_scope ? "" : "static ";
 
-      const char *td_name = tdef->nested_type_name (scope);
+      char const *td_name = tdef->nested_type_name (tdef_scope);
 
       // If the array and the typedef are both declared inside
       // an interface or valuetype, for example, nested_type_name()

TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp

@@ -364,10 +364,10 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node)
   // Step last: generate typecode declaration.
   if (be_global->tc_support ())
     {
-      be_visitor_context ctx (*this->ctx_);
-      be_visitor_typecode_decl visitor (&ctx);
+      be_visitor_context tc_ctx (*this->ctx_);
+      be_visitor_typecode_decl tc_visitor (&tc_ctx);
 
-      if (node->accept (&visitor) == -1)
+      if (node->accept (&tc_visitor) == -1)
         {
           ACE_ERROR_RETURN ((LM_ERROR,
                              ACE_TEXT ("be_visitor_valuetype_ch::")