diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-01 13:52:51 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2012-03-01 13:52:51 +0000 |
| commit | 3f9503cbbbe8983c6d118c5dc7cc3c565202e468 (patch) | |
| tree | 123e3f2918a5982518cf1447853df2e8a2946365 | |
| parent | 134ffb1d308657b12be699f499de9e3edef896aa (diff) | |
| download | ATCD-3f9503cbbbe8983c6d118c5dc7cc3c565202e468.tar.gz | |
Thu Mar 1 13:52:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com>
| -rw-r--r-- | TAO/ChangeLog | 6 | ||||
| -rw-r--r-- | TAO/tao/DynamicAny/DynValue_i.cpp | 4 | ||||
| -rw-r--r-- | TAO/tests/DynValue_Test/Analyzer.cpp | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 6cc2cc320fc..52a9eeb0542 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,9 @@ +Thu Mar 1 13:52:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com> + + * tao/DynaicAny/DynValue_i.cpp: + * tests/DynValue_Test/Analyzer.cpp: + Missing .in () for vars. + Thu Mar 1 11:45:00 UTC 2012 Simon Massey <simon dot massey at prismtech dot com> * tests/DynValue_Test/main.cpp: diff --git a/TAO/tao/DynamicAny/DynValue_i.cpp b/TAO/tao/DynamicAny/DynValue_i.cpp index ed5f4a239a2..0cc309685d0 100644 --- a/TAO/tao/DynamicAny/DynValue_i.cpp +++ b/TAO/tao/DynamicAny/DynValue_i.cpp @@ -140,7 +140,7 @@ TAO_DynValue_i::get_base_types ( base_types.size (numberOfBases + 1); base_types[numberOfBases++] = - CORBA::TypeCode::_duplicate (base); + CORBA::TypeCode::_duplicate (base.in ()); base = base->concrete_base_type(); } } @@ -776,7 +776,7 @@ TAO_DynValue_i::to_outputCDR (TAO_OutputCDR &out_cdr) // are stored in the da_base_types_[] list. CORBA::ULong i= 0u; for (CORBA::TypeCode_var - next (CORBA::TypeCode::_duplicate (this->type_)); + next (CORBA::TypeCode::_duplicate (this->type_.in ())); i < trunc_ids; ++i) { diff --git a/TAO/tests/DynValue_Test/Analyzer.cpp b/TAO/tests/DynValue_Test/Analyzer.cpp index 22356bb9d12..b229ba339f8 100644 --- a/TAO/tests/DynValue_Test/Analyzer.cpp +++ b/TAO/tests/DynValue_Test/Analyzer.cpp @@ -90,7 +90,7 @@ DynAnyAnalyzer::get_base_types ( } base_types.size (numberOfBases + 1); - base_types[numberOfBases++] = CORBA::TypeCode::_duplicate (base); + base_types[numberOfBases++] = CORBA::TypeCode::_duplicate (base.in ()); base = base->concrete_base_type(); } } @@ -201,7 +201,7 @@ DynAnyAnalyzer::analyze ( } BaseTypesList_t base_types; - get_base_types (tc, base_types); + get_base_types (tc.in (), base_types); for (CORBA::ULong i= 0u; i < base_types.size(); ++i) { |