diff options
| author | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-09-04 05:16:26 +0000 |
|---|---|---|
| committer | mk1 <mk1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-09-04 05:16:26 +0000 |
| commit | 1dfd74a7353bca90d3389729e9c6029e68a159cf (patch) | |
| tree | c083211e998d58ee14293ff9ebc7eeb9eb09734f /TAO | |
| parent | ec4bc76673a3dd89ce4523a90cbcbea9d88e7352 (diff) | |
| download | ATCD-1dfd74a7353bca90d3389729e9c6029e68a159cf.tar.gz | |
ChangeLogTag: Sat Sep 03 00:13:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de>
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog-99c | 17 | ||||
| -rw-r--r-- | TAO/tao/append.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/decode.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/deep_free.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/encode.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/skip.cpp | 2 |
6 files changed, 18 insertions, 9 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 6e7c547958f..0b32a4e17af 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,12 @@ +Sat Sep 03 00:13:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de> + + * tao/append.cpp, + tao/decode.cpp, + tao/encode.cpp, + tao/skip.cpp: + Fixed a compilation ambiguity by using "in ()" on + the "vars" assigned to "ptrs". + Fri Sep 3 23:31:11 1999 Balachandran Natarajan <bala@cs.wustl.edu> * tao/deep_free.cpp: @@ -138,10 +147,10 @@ Thu Sep 03 05:00:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de> Thu Sep 03 01:30:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de> - * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp - tests/NestedUpcall/Triangle_Test/Object_A_i.h - tests/NestedUpcall/Triangle_Test/Object_B_i.cpp - tests/NestedUpcall/Triangle_Test/Object_B_i.h + * tests/NestedUpcall/Triangle_Test/Object_A_i.cpp, + tests/NestedUpcall/Triangle_Test/Object_A_i.h, + tests/NestedUpcall/Triangle_Test/Object_B_i.cpp, + tests/NestedUpcall/Triangle_Test/Object_B_i.h, tests/NestedUpcall/Triangle_Test/Triangle_Test.idl: According to the changes in the IDL compiler, which made it conforming to the CORBA spec, some minor diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index 14806c7f0e3..a3da4595fd3 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -488,7 +488,7 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, if (default_index >= 0 && default_index-- == 0) // have we reached the default label?, if so, // save a handle to the typecode for the default - default_tc = member_tc; + default_tc = member_tc.in (); if (discrim_matched) { // marshal according to the matched typecode diff --git a/TAO/tao/decode.cpp b/TAO/tao/decode.cpp index 943b6daa41d..f136f4c0faf 100644 --- a/TAO/tao/decode.cpp +++ b/TAO/tao/decode.cpp @@ -850,7 +850,7 @@ TAO_Marshal_Union::decode (CORBA::TypeCode_ptr tc, // have we reached the default label?, if so, // save a handle to the typecode for the default if (default_index >= 0 && default_index-- == 0) - default_tc = member_tc; + default_tc = member_tc.in (); if (discrim_matched) { member_val = base_union->_access (1); diff --git a/TAO/tao/deep_free.cpp b/TAO/tao/deep_free.cpp index 10a44ab0adb..2b45dbb0e85 100644 --- a/TAO/tao/deep_free.cpp +++ b/TAO/tao/deep_free.cpp @@ -422,7 +422,7 @@ TAO_Marshal_Union::deep_free (CORBA::TypeCode_ptr tc, { // have we reached the default label?, if so, // save a handle to the typecode for the default - default_tc = member_tc; + default_tc = member_tc.in (); } if (discrim_matched) { diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index 4fad23669df..56f517f6864 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -571,7 +571,7 @@ TAO_Marshal_Union::encode (CORBA::TypeCode_ptr tc, { // have we reached the default label?, if so, // save a handle to the typecode for the default - default_tc = member_tc; + default_tc = member_tc.in (); } if (discrim_matched) { diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 76271fbbfd0..6354ac08b8f 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -483,7 +483,7 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, // the typecode for the default if (default_index >= 0 && default_index-- == 0) - default_tc = member_tc; + default_tc = member_tc.in (); if (discrim_matched) { // marshal according to the matched typecode |