summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkolpackov <kolpackov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-31 13:19:23 +0000
committerkolpackov <kolpackov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2002-01-31 13:19:23 +0000
commit481e286fb9768baaa06c730e0558bc85bea743b5 (patch)
treecbe34a30960c1271346e8c669b8ffd362a1ee611
parentadd4ebead0e20738c434d164a39f974ebce4e441 (diff)
downloadATCD-481e286fb9768baaa06c730e0558bc85bea743b5.tar.gz
Thu Jan 31 13:06:12 2002 Boris Kolpackov <bosk@ipmce.ru>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a7
-rw-r--r--TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp4
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index e369136d6c6..b5a2bea4bca 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Thu Jan 31 13:06:12 2002 Boris Kolpackov <bosk@ipmce.ru>
+ * TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp:
+
+ Eliminated code that triggers bug with fully-qualified names
+ in VC++ 6. Thanks to Koushik Banerjee <koushik.banerjee@icmg.nu>
+ for reporting this.
+
Wed Jan 30 21:08:22 2002 Oliver Kellogg <oliver.kellogg@sysde.eads.net>
* performance-tests/Latency/AMH/Single_Threaded/Roundtrip.cpp:
diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
index f16cddc12bc..9168a640ac6 100644
--- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp
@@ -55,7 +55,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
{
if (inh->opt_accessor ())
{
- *os << "if (!";
+ *os << "if (!this->";
this->class_name (inh, os);
*os << "::_tao_marshal_state (strm)) return 0;" << be_nl;
}
@@ -97,7 +97,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node)
{
if (inh->opt_accessor ())
{
- *os << "if (!";
+ *os << "if (!this->";
this->class_name (inh, os);
*os << "::_tao_unmarshal_state (strm)) return 0;" << be_nl;
}