diff --git a/TAO/TAO_IDL/be/be_visitor_map/cdr_op_ch.cpp b/TAO/TAO_IDL/be/be_visitor_map/cdr_op_ch.cpp
index 6a01c82ac2df2..541781e6079a4 100644
--- a/TAO/TAO_IDL/be/be_visitor_map/cdr_op_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_map/cdr_op_ch.cpp
@@ -21,6 +21,10 @@ be_visitor_map_cdr_op_ch::be_visitor_map_cdr_op_ch (
 {
 }
 
+be_visitor_map_cdr_op_ch::~be_visitor_map_cdr_op_ch ()
+{
+}
+
 int
 be_visitor_map_cdr_op_ch::visit_map (be_map *node)
 {
diff --git a/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp b/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
index 8719bf78d782c..e21afc00aa682 100644
--- a/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
@@ -45,7 +45,7 @@ int be_visitor_map_ch::visit_map (be_map *node)
 
   *os << be_nl_2;
 
-  *os << "using " << node->local_name () << " = std::map<";
+  *os << "typedef " << "std::map<";
 
   be_type* kt = node->key_type();
   be_type* vt = node->value_type();
@@ -75,7 +75,7 @@ int be_visitor_map_ch::visit_map (be_map *node)
                         -1);
     }
 
-  *os << ">;";
+  *os << "> " << node->local_name () << ";";
 
   os->gen_endif ();
   node->cli_hdr_gen (true);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_ch.h
index 6194bcc986d17..92a5c0ff50d07 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_ch.h
@@ -31,10 +31,10 @@ class be_visitor_map_cdr_op_ch : public be_visitor_decl
   be_visitor_map_cdr_op_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_map_cdr_op_ch () = default;
+  ~be_visitor_map_cdr_op_ch ();
 
   /// visit map
-  int visit_map (be_map *node) override;
+  virtual int visit_map (be_map *node);
 };
 
 #endif /* _BE_VISITOR_MAP_CDR_OP_CH_H_ */