summaryrefslogtreecommitdiff
path: root/TAO/TAO_IDL
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-07-02 10:18:49 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2007-07-02 10:18:49 +0000
commit5f132561042353d0dabfab730292ba376eebd241 (patch)
tree623b0c2698b963b037db462513b241e05848d0fd /TAO/TAO_IDL
parent7b739d1b5ad3ce53c8e655b4fa9f326768b9a6a1 (diff)
downloadATCD-5f132561042353d0dabfab730292ba376eebd241.tar.gz
ChangeLogTag: Mon Jul 2 10:15:47 UTC 2007 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/TAO_IDL')
-rw-r--r--TAO/TAO_IDL/ast/ast_type.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/TAO/TAO_IDL/ast/ast_type.cpp b/TAO/TAO_IDL/ast/ast_type.cpp
index 6fccb1fd638..869d9e30efe 100644
--- a/TAO/TAO_IDL/ast/ast_type.cpp
+++ b/TAO/TAO_IDL/ast/ast_type.cpp
@@ -323,8 +323,14 @@ AST_Type::nested_name (const char* local_name,
// generations of "::" here and there, which have now been removed.
UTL_Scope *s = this->defined_in ();
AST_Decl *def_scope = s != 0 ? ScopeAsDecl (s) : 0;
+
+ // TypeCode is a special case for predefined types, since it's
+ // defined in the CORBA module.
bool in_root =
- def_scope != 0 && def_scope->node_type () == AST_Decl::NT_root;
+ (def_scope != 0 && def_scope->node_type () == AST_Decl::NT_root)
+ || ((this->node_type () == AST_Decl::NT_pre_defined
+ && ACE_OS::strcmp (this->flat_name (), "CORBA_TypeCode") == 0));
+
ACE_CString fname (this->full_name ());
bool corba_type = fname.find ("CORBA::") == 0;