ChangeLogTag: Tue Jun 19 16:08:34 2001 Sharath R. Cholleti <sharath@cs.wustl.edu>

2 files changed, 19 insertions, 7 deletions

diff --git a/ace/CDR_Stream.cpp b/ace/CDR_Stream.cpp
index 9bdcf73af2f..32739989667 100644
--- a/ace/CDR_Stream.cpp
+++ b/ace/CDR_Stream.cpp
@@ -733,6 +733,25 @@ ACE_InputCDR::ACE_InputCDR (const ACE_OutputCDR& rhs,
     this->start_.copy (i->rd_ptr (), i->length ());
 }
 
+ACE_INLINE ACE_CDR::Boolean
+ACE_InputCDR::skip_wchar (void)
+{
+  if (ACE_static_cast (ACE_CDR::Short, major_version_) == 1
+          && ACE_static_cast (ACE_CDR::Short, minor_version_) == 2)
+  {
+    ACE_CDR::Octet len;
+    if (this->read_1 (&len))
+      return this->skip_bytes (ACE_static_cast (size_t, len));
+  }
+  else
+  {
+    ACE_CDR::WChar x;
+      return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*,&x));
+  }
+
+  return 0;
+}
+
 ACE_CDR::Boolean
 ACE_InputCDR::read_wchar (ACE_CDR::WChar& x)
 {
diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i
index b5a6d75166f..dbd6b1621b1 100644
--- a/ace/CDR_Stream.i
+++ b/ace/CDR_Stream.i
@@ -751,13 +751,6 @@ ACE_InputCDR::skip_char (void)
 }
 
 ACE_INLINE ACE_CDR::Boolean
-ACE_InputCDR::skip_wchar (void)
-{
-  ACE_CDR::WChar x;
-  return this->read_2 (ACE_reinterpret_cast (ACE_CDR::UShort*,&x));
-}
-
-ACE_INLINE ACE_CDR::Boolean
 ACE_InputCDR::skip_octet (void)
 {
   ACE_CDR::Octet x;