summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-04-17 16:13:20 +0000
committerdai_y <dai_y@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-04-17 16:13:20 +0000
commitfe955dff5727b1b7395f17cf2b8462948328e094 (patch)
tree8b232ca5083b9339171088d2e9bee1644a9f01f3
parentd8dc300a443ab7488bb67838024c997211bcba92 (diff)
downloadATCD-fe955dff5727b1b7395f17cf2b8462948328e094.tar.gz
Tue Apr 17 16:05:50 UTC 2007 Yan Dai <dai_y@ociweb.com>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/tao/DynamicAny/DynEnum_i.cpp6
2 files changed, 10 insertions, 3 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index fc24fd99f9b..0f3d190631c 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Apr 17 16:05:50 UTC 2007 Yan Dai <dai_y@ociweb.com>
+
+ * tao/DynamicAny/DynEnum_i.cpp:
+
+ Use .in() on the var to avoid warnings from some
+ platforms.
+
Tue Apr 17 14:29:52 UTC 2007 Chad Elliott <elliott_c@ociweb.com>
* orbsvcs/tests/ImplRepo/Bug_689_Regression/run_test.pl:
diff --git a/TAO/tao/DynamicAny/DynEnum_i.cpp b/TAO/tao/DynamicAny/DynEnum_i.cpp
index 19f34c22274..0c6be6d8473 100644
--- a/TAO/tao/DynamicAny/DynEnum_i.cpp
+++ b/TAO/tao/DynamicAny/DynEnum_i.cpp
@@ -108,7 +108,7 @@ TAO_DynEnum_i::_narrow (CORBA::Object_ptr _tao_objref)
char *
TAO_DynEnum_i::get_as_string (void)
{
- CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_);
+ CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_.in ());
const char *retval = ct.in ()->member_name (this->value_);
@@ -118,7 +118,7 @@ TAO_DynEnum_i::get_as_string (void)
void
TAO_DynEnum_i::set_as_string (const char *value_as_string)
{
- CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_);
+ CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_.in ());
CORBA::ULong count = ct.in ()->member_count ();
@@ -154,7 +154,7 @@ TAO_DynEnum_i::get_as_ulong (void)
void
TAO_DynEnum_i::set_as_ulong (CORBA::ULong value_as_ulong)
{
- CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_);
+ CORBA::TypeCode_var ct = TAO_DynAnyFactory::strip_alias (this->type_.in ());
CORBA::ULong const max = ct.in ()->member_count ();
if (value_as_ulong < max)