diff options
| author | gokhale <asgokhale@users.noreply.github.com> | 1998-12-29 18:23:18 +0000 |
|---|---|---|
| committer | gokhale <asgokhale@users.noreply.github.com> | 1998-12-29 18:23:18 +0000 |
| commit | 2f40b2774ee465084cb59873883a5fbcdfe2a3ae (patch) | |
| tree | c9e6865c2513898c1e809c897af5b11e99ee7812 | |
| parent | 34831132749c594a8a50c1f1d8ed498b57ea80dc (diff) | |
| download | ATCD-2f40b2774ee465084cb59873883a5fbcdfe2a3ae.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-98c | 11 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp | 6 |
2 files changed, 14 insertions, 3 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index a59be78331f..8f571ecc554 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,14 @@ +Tue Dec 29 13:16:08 1998 Aniruddha Gokhale <gokhale@sahyadri.research.bell-labs.com> + + * TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp: + + We were generating variables with names that had two consecutive + underscores ('_'). However, as per the C++ standard, variables + with __ are reserved for the compiler. This happened with the + typecode variables with prefix _tc__tc. We now generate + _tc_TAO_tc. Thanks to Jonathan Biggar <jon@floorboard.com> for + noticing this. + Mon Dec 28 16:44:18 1998 Irfan Pyarali <irfan@cs.wustl.edu> * orbsvcs/orbsvcs/Event/EC_Gateway_UDP: Fixed "used before it was diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp index 82f767c5b34..f9e8584abeb 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/typecode_defn.cpp @@ -106,7 +106,7 @@ be_visitor_typecode_defn::visit_type (be_type *node) } *os << be_uidt << "};" << be_nl; - *os << "static CORBA::TypeCode _tc__tc_" << node->flatname () + *os << "static CORBA::TypeCode _tc_TAO_tc_" << node->flatname () << " ("; switch (node->node_type ()) { @@ -158,7 +158,7 @@ be_visitor_typecode_defn::visit_type (be_type *node) -1); } *os << "TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_" - << node->local_name () << ", &_tc__tc_" + << node->local_name () << ", &_tc_TAO_tc_" << node->flatname () << ")" << be_nl; if (this->gen_nested_namespace_end (module) == -1) { @@ -171,7 +171,7 @@ be_visitor_typecode_defn::visit_type (be_type *node) else { // outermost scope. - *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc__tc_" + *os << "CORBA::TypeCode_ptr " << node->tc_name () << " = &_tc_TAO_tc_" << node->flatname () << ";\n\n"; } return 0; |