Fri Nov 24 09:32:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>

12 files changed, 43 insertions, 203 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index f00c0473071..4a603a48d08 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,32 @@
+Fri Nov 24 09:32:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * tao/Bounded_Basic_String_Sequence_T.h:
+        * tao/Unbounded_Basic_String_Sequence_T.h:
+          Moved these templates from TAO::details to TAO namespace because
+          we are going to move these templates directly
+
+        * tao/Bounded_String_Sequence_T.h:
+        * tao/Bounded_Wstring_Sequence_T.h:
+        * tao/Unbounded_String_Sequence_T.h:
+        * tao/Unbounded_Wstring_Sequence_T.h:
+          Removed, not used anymore, the IDL compiler uses the basic string
+          sequence directly.
+
+        * TAO_IDL/be/be_visitor_template_export.cpp:
+          Removed special handling for (w)string sequences
+
+        * TAO_IDL/be/be_sequence.cpp:
+          Changed generation to use basic string sequence template directly
+
+        * tao/Sequence_T.h:
+        * tao/tao.mpc:
+          Removed the files that got removed
+
+        * tao/Unbounded_Sequence_CDR_T.h:
+        * tao/Bounded_Sequence_CDR_T.h:
+          Updated because of the move of the basic string sequence files
+          from TAO::details to TAO
+
 Fri Nov 24 06:28:12 UTC 2006  Johnny Willemsen  <jwillemsen@remedy.nl>
 
         * tao/tao.mpc:
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 57e3185c11b..fb8131c0c32 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -467,7 +467,7 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         {
           ACE_OS::sprintf (namebuf,
-                           "TAO::unbounded_string_sequence");
+                           "TAO::unbounded_basic_string_sequence<char>");
         }
       else
         {
@@ -481,7 +481,7 @@ be_sequence::instance_name ()
       if (this->unbounded ())
         {
           ACE_OS::sprintf (namebuf,
-                           "TAO::unbounded_wstring_sequence");
+                           "TAO::unbounded_basic_string_sequence<CORBA::WChar>");
         }
       else
         {
@@ -587,11 +587,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
     case be_sequence::MNG_STRING:
       if (this->unbounded ())
         {
-          *os << "TAO::unbounded_string_sequence";
+          *os << "TAO::unbounded_basic_string_sequence<char>";
         }
       else
         {
-          *os << "TAO::bounded_string_sequence<"
+          *os << "TAO::bounded_basic_string_sequence<char, "
               << this->max_size ()->ev ()->u.ulval << ">";
         }
 
@@ -599,11 +599,11 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
     case be_sequence::MNG_WSTRING:
       if (this->unbounded ())
         {
-          *os << "TAO::unbounded_wstring_sequence";
+          *os << "TAO::unbounded_basic_string_sequence<CORBA::WChar>";
         }
       else
         {
-          *os << "TAO::bounded_wstring_sequence<"
+          *os << "TAO::bounded_basic_string_sequence<CORBA::WChar, "
               << this->max_size ()->ev ()->u.ulval << ">";
         }
 
diff --git a/TAO/TAO_IDL/be/be_visitor_template_export.cpp b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
index c4a72f0117f..6fb14458121 100644
--- a/TAO/TAO_IDL/be/be_visitor_template_export.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_template_export.cpp
@@ -78,13 +78,6 @@ be_visitor_template_export::visit_sequence (be_sequence *node)
 
   be_type *bt = be_type::narrow_from_decl (node->base_type ());
 
-  // If this is a (w)string don't generate a thing
-  if ((node->managed_type () == be_sequence::MNG_STRING) ||
-      (node->managed_type () == be_sequence::MNG_WSTRING))
-  {
-    return 0;
-  }
-
   // TAO provides extensions for octet sequences, first find out if
   // the base type is an octet (or an alias for octet).
   be_predefined_type *predef = 0;
diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h
index da573662bc7..a1078da179e 100644
--- a/TAO/tao/Bounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h
@@ -18,9 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-namespace details
-{
-
 template<typename charT, CORBA::ULong MAX>
 class bounded_basic_string_sequence
 {
@@ -109,8 +106,6 @@ public:
 private:
   implementation_type impl_;
 };
-
-} // namespace details
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Bounded_Sequence_CDR_T.h b/TAO/tao/Bounded_Sequence_CDR_T.h
index 70d1480f1ba..adfd7e1cea1 100644
--- a/TAO/tao/Bounded_Sequence_CDR_T.h
+++ b/TAO/tao/Bounded_Sequence_CDR_T.h
@@ -282,8 +282,8 @@ namespace TAO {
   }
 
   template <typename stream, typename charT, CORBA::ULong MAX>
-  bool demarshal_sequence(stream & strm, TAO::details::bounded_basic_string_sequence <charT, MAX> & target) {
-    typedef typename TAO::details::bounded_basic_string_sequence <charT, MAX> sequence;
+  bool demarshal_sequence(stream & strm, TAO::bounded_basic_string_sequence <charT, MAX> & target) {
+    typedef typename TAO::bounded_basic_string_sequence <charT, MAX> sequence;
     typedef typename sequence::element_traits::string_var string_var;
     ::CORBA::ULong new_length = 0;
     if (!(strm >> new_length)) {
@@ -482,7 +482,7 @@ namespace TAO {
   }
 
   template <typename stream, typename charT, CORBA::ULong MAX>
-  bool marshal_sequence(stream & strm, const TAO::details::bounded_basic_string_sequence <charT, MAX> & source) {
+  bool marshal_sequence(stream & strm, const TAO::bounded_basic_string_sequence <charT, MAX> & source) {
     if (0 == &source)
       ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
diff --git a/TAO/tao/Bounded_String_Sequence_T.h b/TAO/tao/Bounded_String_Sequence_T.h
deleted file mode 100644
index 9f6373343b6..00000000000
--- a/TAO/tao/Bounded_String_Sequence_T.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef guard_bounded_string_sequence_hpp
-#define guard_bounded_string_sequence_hpp
-/**
- * @file
- *
- * @brief Implement bounded sequences for strings.
- *
- * $Id$
- *
- * @author Carlos O'Ryan
- */
-
-#include "tao/Bounded_Basic_String_Sequence_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-template<CORBA::ULong MAX>
-class bounded_string_sequence
-  : public details::bounded_basic_string_sequence<char,MAX>
-{
-public:
-  inline bounded_string_sequence()
-    : details::bounded_basic_string_sequence<char,MAX>()
-  {}
-  inline bounded_string_sequence(
-      CORBA::ULong length,
-      char * * data,
-      CORBA::Boolean release = false)
-    : details::bounded_basic_string_sequence<char,MAX>(
-        length, data, release)
-  {}
-};
-
-
-} // namespace TAO
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif // guard_bounded_string_sequence_hpp
diff --git a/TAO/tao/Bounded_Wstring_Sequence_T.h b/TAO/tao/Bounded_Wstring_Sequence_T.h
deleted file mode 100644
index c0ed84f289e..00000000000
--- a/TAO/tao/Bounded_Wstring_Sequence_T.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef guard_bounded_wstring_sequence_hpp
-#define guard_bounded_wstring_sequence_hpp
-/**
- * @file
- *
- * @brief Implement bounded sequences for wstrings.
- *
- * $Id$
- *
- * @author Carlos O'Ryan
- */
-
-#include "tao/Bounded_Basic_String_Sequence_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-template<CORBA::ULong MAX>
-class bounded_wstring_sequence
-  : public details::bounded_basic_string_sequence<CORBA::WChar,MAX>
-{
-public:
-  inline bounded_wstring_sequence()
-    : details::bounded_basic_string_sequence<CORBA::WChar,MAX>()
-  {}
-  inline bounded_wstring_sequence(
-      CORBA::ULong length,
-      CORBA::WChar * * data,
-      CORBA::Boolean release = false)
-    : details::bounded_basic_string_sequence<CORBA::WChar,MAX>(
-        length, data, release)
-  {}
-};
-
-
-} // namespace TAO
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif // guard_bounded_wstring_sequence_hpp
diff --git a/TAO/tao/Sequence_T.h b/TAO/tao/Sequence_T.h
index 5105a76b7df..f4ee888505b 100644
--- a/TAO/tao/Sequence_T.h
+++ b/TAO/tao/Sequence_T.h
@@ -2,14 +2,12 @@
 
 #include "tao/Unbounded_Octet_Sequence_T.h"
 #include "tao/Unbounded_Value_Sequence_T.h"
-#include "tao/Unbounded_Wstring_Sequence_T.h"
-#include "tao/Unbounded_String_Sequence_T.h"
+#include "tao/Unbounded_Basic_String_Sequence_T.h"
 #include "tao/Unbounded_Object_Reference_Sequence_T.h"
 #include "tao/Unbounded_Array_Sequence_T.h"
 #include "tao/Unbounded_Sequence_CDR_T.h"
 #include "tao/Bounded_Value_Sequence_T.h"
-#include "tao/Bounded_Wstring_Sequence_T.h"
-#include "tao/Bounded_String_Sequence_T.h"
+#include "tao/Bounded_Basic_String_Sequence_T.h"
 #include "tao/Bounded_Object_Reference_Sequence_T.h"
 #include "tao/Bounded_Array_Sequence_T.h"
 #include "tao/Bounded_Sequence_CDR_T.h"
diff --git a/TAO/tao/Unbounded_Basic_String_Sequence_T.h b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
index 79aed91cb64..69ce15dfd58 100644
--- a/TAO/tao/Unbounded_Basic_String_Sequence_T.h
+++ b/TAO/tao/Unbounded_Basic_String_Sequence_T.h
@@ -18,9 +18,6 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL
 
 namespace TAO
 {
-namespace details
-{
-
 template<typename charT>
 class unbounded_basic_string_sequence
 {
@@ -103,8 +100,6 @@ public:
 private:
   implementation_type impl_;
 };
-
-} // namespace details
 } // namespace TAO
 
 TAO_END_VERSIONED_NAMESPACE_DECL
diff --git a/TAO/tao/Unbounded_Sequence_CDR_T.h b/TAO/tao/Unbounded_Sequence_CDR_T.h
index 519a1a1b989..a9a22457e65 100644
--- a/TAO/tao/Unbounded_Sequence_CDR_T.h
+++ b/TAO/tao/Unbounded_Sequence_CDR_T.h
@@ -317,8 +317,8 @@ namespace TAO {
   }
 
   template <typename stream, typename charT>
-  bool demarshal_sequence(stream & strm, TAO::details::unbounded_basic_string_sequence <charT> & target) {
-    typedef TAO::details::unbounded_basic_string_sequence <charT> sequence;
+  bool demarshal_sequence(stream & strm, TAO::unbounded_basic_string_sequence <charT> & target) {
+    typedef TAO::unbounded_basic_string_sequence <charT> sequence;
     typedef typename sequence::element_traits::string_var string_var;
     ::CORBA::ULong new_length = 0;
     if (!(strm >> new_length)) {
@@ -533,7 +533,7 @@ namespace TAO {
   }
 
   template <typename stream, typename charT>
-  bool marshal_sequence(stream & strm, const TAO::details::unbounded_basic_string_sequence <charT> & source) {
+  bool marshal_sequence(stream & strm, const TAO::unbounded_basic_string_sequence <charT> & source) {
     if (0 == &source)
       ACE_THROW_RETURN (::CORBA::BAD_PARAM(0, CORBA::COMPLETED_MAYBE), false);
     ::CORBA::ULong const length = source.length ();
diff --git a/TAO/tao/Unbounded_String_Sequence_T.h b/TAO/tao/Unbounded_String_Sequence_T.h
deleted file mode 100644
index 9b126308dcd..00000000000
--- a/TAO/tao/Unbounded_String_Sequence_T.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef guard_unbounded_string_sequence_hpp
-#define guard_unbounded_string_sequence_hpp
-/**
- * @file
- *
- * @brief Implement unbounded sequences for strings.
- *
- * $Id$
- *
- * @author Carlos O'Ryan
- */
-#include "tao/Unbounded_Basic_String_Sequence_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-class unbounded_string_sequence
-  : public details::unbounded_basic_string_sequence<char>
-{
-public:
-  inline unbounded_string_sequence()
-    : details::unbounded_basic_string_sequence<char>()
-  {}
-  inline explicit unbounded_string_sequence(CORBA::ULong maximum)
-    : details::unbounded_basic_string_sequence<char>(maximum)
-  {}
-  inline unbounded_string_sequence(
-      CORBA::ULong maximum,
-      CORBA::ULong length,
-      value_type * data,
-      CORBA::Boolean release = false)
-    : details::unbounded_basic_string_sequence<char>(
-        maximum, length, data, release)
-  {}
-};
-
-} // namespace TAO
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif // guard_unbounded_string_sequence_hpp
diff --git a/TAO/tao/Unbounded_Wstring_Sequence_T.h b/TAO/tao/Unbounded_Wstring_Sequence_T.h
deleted file mode 100644
index fe8bd1d14b2..00000000000
--- a/TAO/tao/Unbounded_Wstring_Sequence_T.h
+++ /dev/null
@@ -1,43 +0,0 @@
-#ifndef guard_unbounded_wstring_sequence_hpp
-#define guard_unbounded_wstring_sequence_hpp
-/**
- * @file
- *
- * @brief Implement unbounded sequences for wide strings.
- *
- * $Id$
- *
- * @author Carlos O'Ryan
- */
-#include "tao/Unbounded_Basic_String_Sequence_T.h"
-
-TAO_BEGIN_VERSIONED_NAMESPACE_DECL
-
-namespace TAO
-{
-
-class unbounded_wstring_sequence
-  : public details::unbounded_basic_string_sequence<CORBA::WChar>
-{
-public:
-  inline unbounded_wstring_sequence()
-    : details::unbounded_basic_string_sequence<CORBA::WChar>()
-  {}
-  inline /* explicit */ unbounded_wstring_sequence(CORBA::ULong maximum)
-    : details::unbounded_basic_string_sequence<CORBA::WChar>(maximum)
-  {}
-  inline unbounded_wstring_sequence(
-      CORBA::ULong maximum,
-      CORBA::ULong length,
-      value_type * data,
-      CORBA::Boolean release = false)
-    : details::unbounded_basic_string_sequence<CORBA::WChar>(
-        maximum, length, data, release)
-  {}
-};
-
-} // namespace TAO
-
-TAO_END_VERSIONED_NAMESPACE_DECL
-
-#endif // guard_unbounded_wstring_sequence_hpp