diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 771bf1d8f7fab..91bbf14983a34 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -122,15 +122,12 @@ void
 TAO_DynEnum_i::set_as_string (const char *value_as_string)
 {
   CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_.in ());
-
-  CORBA::ULong count = ct.in ()->member_count ();
-
+  CORBA::ULong const count = ct.in ()->member_count ();
   CORBA::ULong i {};
-  const char *temp {};
 
   for (i = 0; i < count; ++i)
     {
-      temp = ct.in ()->member_name (i);
+      const char *temp = ct.in ()->member_name (i);
 
       if (!ACE_OS::strcmp (value_as_string, temp))
         {
diff --git a/TAO/tao/DynamicAny/DynStruct_i.cpp b/TAO/tao/DynamicAny/DynStruct_i.cpp
index 127650d2c8d48..7a65de983dbdc 100644
--- a/TAO/tao/DynamicAny/DynStruct_i.cpp
+++ b/TAO/tao/DynamicAny/DynStruct_i.cpp
@@ -521,7 +521,7 @@ TAO_DynStruct_i::to_any ()
       out_cdr << this->type_->id ();
     }
 
-  TAO::Any_Impl *field_impl {};
+
   TAO::Unknown_IDL_Type *field_unk {};
   TAO_InputCDR field_in_cdr (static_cast<ACE_Message_Block *> (0));
 
@@ -535,12 +535,11 @@ TAO_DynStruct_i::to_any ()
         this->da_members_[i]->to_any ();
 
       TAO_OutputCDR field_out_cdr;
-      field_impl = field_any->impl ();
+      TAO::Any_Impl *field_impl = field_any->impl ();
 
       if (field_impl->encoded ())
         {
-          field_unk =
-            dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
+          field_unk = dynamic_cast<TAO::Unknown_IDL_Type *> (field_impl);
 
           if (!field_unk)
             throw CORBA::INTERNAL ();