diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-08-10 17:49:14 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2010-08-10 17:49:14 +0000 |
| commit | 221472b0ddf965f5514e8dc86c708a375179fc0d (patch) | |
| tree | 8e567ac8a7ebeba65bea8af389a16b1e05cc0be8 | |
| parent | 0c50a26a3d036ad9abe58a9720e556efb72b315e (diff) | |
| download | ATCD-221472b0ddf965f5514e8dc86c708a375179fc0d.tar.gz | |
ChangeLogTag: Tue Aug 10 17:46:16 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/fe_init.cpp | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 093430c3386..7a65619ca18 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Aug 10 17:46:16 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> + + * TAO_IDL/fe/fe_init.cpp(fe_populate_global_scope): + + Put "omg.org" on the pragma prefix stack temporarily + so it will be applied when creating CORBA module + and its contents. + Tue Aug 10 12:24:31 UTC 2010 Jeff Parsons <j.parsons@vanderbilt.edu> * tests/IDL_Test/included.idl: diff --git a/TAO/TAO_IDL/fe/fe_init.cpp b/TAO/TAO_IDL/fe/fe_init.cpp index 5afd45db6db..370cc756c16 100644 --- a/TAO/TAO_IDL/fe/fe_init.cpp +++ b/TAO/TAO_IDL/fe/fe_init.cpp @@ -100,6 +100,11 @@ fe_populate_global_scope (void) root->fe_add_predefined_type (pdt); + /// Put this prefix in force while we're creating the + /// CORBA module and its contents. + char *prefix = ACE::strnew ("omg.org"); + idl_global->pragma_prefixes ().push (prefix); + Identifier corba_id ("CORBA"); UTL_ScopedName sn (&corba_id, 0); @@ -248,6 +253,10 @@ fe_populate_global_scope (void) &TypeCode_name); m->fe_add_predefined_type (pdt); + + char *trash = 0; + idl_global->pragma_prefixes ().pop (trash); + ACE::strdelete (trash); } // Populate idl_global's hash map with upper case versions of |