Merge pull request #1481 from iguessthislldo/igtd/dcps-data-seq

Support C++ Keywords in `DCPS_DATA_SEQUENCE_TYPE`

1 files changed, 3 insertions, 18 deletions

diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index dcd96d21466..a3bb95963e2 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -100,27 +100,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
 
   if (idl_global->dcps_sequence_type_defined (node->full_name ()))
     {
-      // generate the sequence declaration as if it was native. This
-      // to satisfy DDS
-
-      // strip  the "Seq" ending to get the sample's name
-      const char * node_name = node->full_name ();
-      const size_t max_name_length = 2000;
-      if (ACE_OS::strlen (node_name) >= max_name_length)
-        {
-          return -1;
-        }
-      char sample_name[max_name_length];
-      ACE_OS::strncpy (sample_name,
-                       node_name,
-                       ACE_OS::strlen (node_name) - 3);
-      sample_name[ACE_OS::strlen (node_name) - 3] = '\0';
-
+      // Special Implementation for OpenDDS
       *os << be_nl_2
           << "typedef ::TAO::DCPS::ZeroCopyDataSeq< "
-          << sample_name
+          << node->base_type ()->full_name ()
           << ", DCPS_ZERO_COPY_SEQ_DEFAULT_SIZE> "
-          << node->local_name ()
+          << node->original_local_name ()
           << ";" << be_nl;
     }
   else