Merge pull request #2141 from mitza-oci/tao2-idlmap

IDL map: more TAO2 compatibility
DOCGroup · Oct 6, 2023 · 3a598e5 · 3a598e5
2 parents 853cbe1 + 2515d8e
commit 3a598e5
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/TAO/TAO_IDL/ast/ast_map.cpp b/TAO/TAO_IDL/ast/ast_map.cpp
@@ -170,6 +170,9 @@ AST_Map::AST_Map (AST_Expression *ms,
     || vnt == AST_Decl::NT_param_holder;
 }
 
+AST_Map::~AST_Map ()
+{}
+
 // Public operations.
 
 bool

diff --git a/TAO/TAO_IDL/be/be_map.cpp b/TAO/TAO_IDL/be/be_map.cpp
@@ -146,7 +146,7 @@ be_map::gen_name ()
                         0);
     }
 
-  std::snprintf (namebuf,
+  ACE_OS::snprintf (namebuf,
                     NAMEBUFSIZE,
                     "_tao_map_%s_%s_",
                     kt->flat_name (), vt->flat_name ());
@@ -155,10 +155,10 @@ be_map::gen_name ()
   if (this->unbounded () == false)
     {
       char ulval_str [NAMEBUFSIZE];
-      std::snprintf (ulval_str,
-                      NAMEBUFSIZE,
-                      "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
-                      this->max_size ()->ev ()->u.ulval);
+      ACE_OS::snprintf (ulval_str,
+                        NAMEBUFSIZE,
+                        "_" ACE_UINT32_FORMAT_SPECIFIER_ASCII,
+                        this->max_size ()->ev ()->u.ulval);
       ACE_OS::strcat (namebuf,
                       ulval_str);
     }

diff --git a/TAO/TAO_IDL/include/ast_map.h b/TAO/TAO_IDL/include/ast_map.h
@@ -81,7 +81,7 @@ class TAO_IDL_FE_Export AST_Map : public virtual AST_ConcreteType
            bool local,
            bool abstract);
 
-  virtual ~AST_Map () = default;
+  virtual ~AST_Map ();
 
   virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list);
   // Are we or the node represented by node involved in recursion.
-Original file line number
+Diff line change
@@ Expand Up / @@ -170,6 +170,9 @@ AST_Map::AST_Map (AST_Expression *ms, @@
         || vnt == AST_Decl::NT_param_holder;
     }
+    AST_Map::~AST_Map ()
+    {}
     // Public operations.
     bool
@@ Expand Down @@