summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-12-09 20:10:42 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-12-09 20:10:42 +0000
commitfa04bb7443a1e2e6ee5ea1e3088eb48bf76ab546 (patch)
treeb1b657c746793be8fb171b3ac9263a82910eba16
parent92788dc80b00b2e110de85c50e97e234355ee1a1 (diff)
downloadATCD-fa04bb7443a1e2e6ee5ea1e3088eb48bf76ab546.tar.gz
ChangeLogTag: Tue Dec 9 14:07:28 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
-rw-r--r--TAO/ChangeLog7
-rw-r--r--TAO/TAO_IDL/be/be_visitor_operation/operation.cpp4
2 files changed, 9 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index bed1d640583..0d6866f543b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,10 @@
+Tue Dec 9 14:07:28 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
+
+ * TAO_IDL/be/be_visitor_operation/operation.cpp (gen_stub_operation_body);
+
+ Fixed calculation of operation name string length when the name has
+ a '_cxx_' prefix due to a name class with a C++ keyword.
+
Tue Dec 9 13:42:00 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
* TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp (gen_nested_namespace_end):
diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
index 1e9a7ce39a5..3c09e62fcef 100644
--- a/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_operation/operation.cpp
@@ -485,9 +485,9 @@ be_visitor_operation::gen_stub_operation_body (
-1);
}
-
+ // Use the name without the possible '_cxx_' here.
long tmp_len =
- ACE_OS::strlen (node->local_name ()->get_string ());
+ ACE_OS::strlen (node->original_local_name ()->get_string ());
*os << be_nl << be_nl
<< "TAO::" << (node->is_abstract () ? "AbstractBase_" : "" )