From b521674319cdcf962d88f184a5e9bc93835167c0 Mon Sep 17 00:00:00 2001
From: labancap <labancap@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Wed, 20 Feb 2013 22:08:07 +0000
Subject: Changed DynamicAny sequence equivalancy checks

---
 TAO/tao/DynamicAny/DynAny_i.cpp  | 14 +++++++++++++-
 TAO/tao/DynamicAny/DynCommon.cpp | 26 +++++++++++++-------------
 2 files changed, 26 insertions(+), 14 deletions(-)

(limited to 'TAO/tao/DynamicAny')

diff --git a/TAO/tao/DynamicAny/DynAny_i.cpp b/TAO/tao/DynamicAny/DynAny_i.cpp
index b1ae05712c2..e772ecb30db 100644
--- a/TAO/tao/DynamicAny/DynAny_i.cpp
+++ b/TAO/tao/DynamicAny/DynAny_i.cpp
@@ -56,7 +56,19 @@ TAO_DynAny_i::check_typecode (CORBA::TypeCode_ptr tc)
     case CORBA::tk_longdouble:
       break;
     case CORBA::tk_sequence:
-      if (TAO_DynCommon::is_basic_type_seq (tc))
+      if (tc->equivalent (CORBA::_tc_BooleanSeq)
+        || tc->equivalent (CORBA::_tc_OctetSeq)
+        || tc->equivalent (CORBA::_tc_CharSeq)
+        || tc->equivalent (CORBA::_tc_WCharSeq)
+        || tc->equivalent (CORBA::_tc_ShortSeq)
+        || tc->equivalent (CORBA::_tc_UShortSeq)
+        || tc->equivalent (CORBA::_tc_LongSeq)
+        || tc->equivalent (CORBA::_tc_ULongSeq)
+        || tc->equivalent (CORBA::_tc_LongLongSeq)
+        || tc->equivalent (CORBA::_tc_ULongLongSeq)
+        || tc->equivalent (CORBA::_tc_FloatSeq)
+        || tc->equivalent (CORBA::_tc_DoubleSeq)
+        || tc->equivalent (CORBA::_tc_LongDoubleSeq))
         {
           // Otherwise fall through.
           break;
diff --git a/TAO/tao/DynamicAny/DynCommon.cpp b/TAO/tao/DynamicAny/DynCommon.cpp
index 1cee4b1adbe..6c6487f36d0 100644
--- a/TAO/tao/DynamicAny/DynCommon.cpp
+++ b/TAO/tao/DynamicAny/DynCommon.cpp
@@ -1255,19 +1255,19 @@ TAO_DynCommon::check_type (CORBA::TypeCode_ptr tc)
 bool
 TAO_DynCommon::is_basic_type_seq (CORBA::TypeCode_ptr tc)
 {
-  return (tc->equivalent (CORBA::_tc_BooleanSeq)
-          || tc->equivalent (CORBA::_tc_OctetSeq)
-          || tc->equivalent (CORBA::_tc_CharSeq)
-          || tc->equivalent (CORBA::_tc_WCharSeq)
-          || tc->equivalent (CORBA::_tc_ShortSeq)
-          || tc->equivalent (CORBA::_tc_UShortSeq)
-          || tc->equivalent (CORBA::_tc_LongSeq)
-          || tc->equivalent (CORBA::_tc_ULongSeq)
-          || tc->equivalent (CORBA::_tc_LongLongSeq)
-          || tc->equivalent (CORBA::_tc_ULongLongSeq)
-          || tc->equivalent (CORBA::_tc_FloatSeq)
-          || tc->equivalent (CORBA::_tc_DoubleSeq)
-          || tc->equivalent (CORBA::_tc_LongDoubleSeq));
+  return (tc->equal (CORBA::_tc_BooleanSeq)
+          || tc->equal (CORBA::_tc_OctetSeq)
+          || tc->equal (CORBA::_tc_CharSeq)
+          || tc->equal (CORBA::_tc_WCharSeq)
+          || tc->equal (CORBA::_tc_ShortSeq)
+          || tc->equal (CORBA::_tc_UShortSeq)
+          || tc->equal (CORBA::_tc_LongSeq)
+          || tc->equal (CORBA::_tc_ULongSeq)
+          || tc->equal (CORBA::_tc_LongLongSeq)
+          || tc->equal (CORBA::_tc_ULongLongSeq)
+          || tc->equal (CORBA::_tc_FloatSeq)
+          || tc->equal (CORBA::_tc_DoubleSeq)
+          || tc->equal (CORBA::_tc_LongDoubleSeq));
 }
 
 CORBA::Boolean
-- 
cgit v1.2.1