From 481b1f839e08c91b8458d458f5e05f6b82dc806c Mon Sep 17 00:00:00 2001
From: Tyler <tyler@tylermayoff.com>
Date: Fri, 27 Oct 2023 08:27:43 -0400
Subject: [PATCH 1/2] added non defaulted desctructors

---
 TAO/TAO_IDL/be/be_visitor_map/cdr_op_cs.cpp       | 4 ++++
 TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp          | 4 ++++
 TAO/TAO_IDL/be/be_visitor_map/map_cs.cpp          | 4 ++++
 TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_cs.h | 2 +-
 TAO/TAO_IDL/be_include/be_visitor_map/map_ch.h    | 2 +-
 TAO/TAO_IDL/be_include/be_visitor_map/map_cs.h    | 2 +-
 6 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/TAO/TAO_IDL/be/be_visitor_map/cdr_op_cs.cpp b/TAO/TAO_IDL/be/be_visitor_map/cdr_op_cs.cpp
index 4856711f04c3e..c297197cc75fe 100644
--- a/TAO/TAO_IDL/be/be_visitor_map/cdr_op_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_map/cdr_op_cs.cpp
@@ -22,6 +22,10 @@ be_visitor_map_cdr_op_cs::be_visitor_map_cdr_op_cs (be_visitor_context *ctx)
 {
 }
 
+be_visitor_map_cdr_op_cs::~be_visitor_map_cdr_op_cs ()
+{
+}
+
 int
 be_visitor_map_cdr_op_cs::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 e21afc00aa682..380f29a932321 100644
--- a/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
@@ -17,6 +17,10 @@ be_visitor_map_ch::be_visitor_map_ch (be_visitor_context *ctx)
 {
 }
 
+be_visitor_map_ch::~be_visitor_map_ch ()
+{
+}
+
 int be_visitor_map_ch::visit_map (be_map *node)
 {
   if (node->defined_in () == 0)
diff --git a/TAO/TAO_IDL/be/be_visitor_map/map_cs.cpp b/TAO/TAO_IDL/be/be_visitor_map/map_cs.cpp
index 2c1f831d08150..4d87ef3b566e1 100644
--- a/TAO/TAO_IDL/be/be_visitor_map/map_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_map/map_cs.cpp
@@ -20,6 +20,10 @@ be_visitor_map_cs::be_visitor_map_cs (be_visitor_context *ctx)
 {
 }
 
+be_visitor_map_cs::~be_visitor_map_cs ()
+{
+}
+
 int be_visitor_map_cs::visit_map (be_map *)
 {
   return 0;
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_cs.h
index 589875c890265..8cec44c6f0fd3 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/cdr_op_cs.h
@@ -29,7 +29,7 @@ class be_visitor_map_cdr_op_cs : public be_visitor_decl
   be_visitor_map_cdr_op_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_map_cdr_op_cs () = default;
+  ~be_visitor_map_cdr_op_cs ();
 
   /// visit map
   virtual int visit_map (be_map *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/map_ch.h b/TAO/TAO_IDL/be_include/be_visitor_map/map_ch.h
index a94eabc33665f..14dbbd83593eb 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_map/map_ch.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/map_ch.h
@@ -30,7 +30,7 @@ class be_visitor_map_ch : public be_visitor_decl
   be_visitor_map_ch (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_map_ch () = default;
+  ~be_visitor_map_ch ();
 
   /// visit map node.
   virtual int visit_map (be_map *node);
diff --git a/TAO/TAO_IDL/be_include/be_visitor_map/map_cs.h b/TAO/TAO_IDL/be_include/be_visitor_map/map_cs.h
index bb3f651e9efd0..de0834d399798 100644
--- a/TAO/TAO_IDL/be_include/be_visitor_map/map_cs.h
+++ b/TAO/TAO_IDL/be_include/be_visitor_map/map_cs.h
@@ -32,7 +32,7 @@ class be_visitor_map_cs : public be_visitor_decl
   be_visitor_map_cs (be_visitor_context *ctx);
 
   /// destructor
-  ~be_visitor_map_cs () = default;
+  ~be_visitor_map_cs ();
 
   /// visit map node
   virtual int visit_map (be_map *node);

From a43a9df97954bfe20f7b2dfae4d4e8daa0d51670 Mon Sep 17 00:00:00 2001
From: Tyler <tyler@tylermayoff.com>
Date: Fri, 27 Oct 2023 10:00:19 -0400
Subject: [PATCH 2/2] added space to generated code to produce "< ::"

---
 TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 380f29a932321..ec87fb6a00794 100644
--- a/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_map/map_ch.cpp
@@ -49,7 +49,7 @@ int be_visitor_map_ch::visit_map (be_map *node)
 
   *os << be_nl_2;
 
-  *os << "typedef " << "std::map<";
+  *os << "typedef " << "std::map< ";
 
   be_type* kt = node->key_type();
   be_type* vt = node->value_type();