diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-03-29 13:12:52 +0000 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2013-03-29 13:12:52 +0000 |
commit | c6a1f1b937c077cc3d2106c0b2836037d6d20975 (patch) | |
tree | eb96842dee38f6c26b6d2e7ea8a64d3512b52e00 /TAO/TAO_IDL/be_include | |
parent | 6563937cdc93d8363805f9700f042131c2fa996b (diff) | |
download | ATCD-c6a1f1b937c077cc3d2106c0b2836037d6d20975.tar.gz |
Fri Mar 29 13:11:10 UTC 2013 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/config/tao_versioning_idl_defaults.mpb:
Zapped empty line
* TAO_IDL/be/be_codegen.cpp:
* TAO_IDL/be/be_global.cpp:
* TAO_IDL/be/be_util.cpp:
* TAO_IDL/be_include/be_global.h:
Added versioning_include to specify a different versioned
header include and resolved some problems when trying to
use versioned namespaces also for the application code
Diffstat (limited to 'TAO/TAO_IDL/be_include')
-rw-r--r-- | TAO/TAO_IDL/be_include/be_global.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index 560281e9ab0..919d04a6ffb 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -417,6 +417,12 @@ public: /// Get text that opens a "versioned" namespace. const char * versioning_begin (void) const; + /// Set include file for "versioned" namespace. + void versioning_include (const char* s); + + /// Get include file for "versioned" namespace. + const char * versioning_include (void) const; + /// Get text that opens a "versioned" namespace for core TAO/orbsvcs /// related code. const char * core_versioning_begin (void) const; @@ -963,12 +969,15 @@ private: /// orbsvcs related code. ACE_CString core_versioning_end_; - /// Text that opens a "versioned" namepace. + /// Text that opens a "versioned" namespace. ACE_CString versioning_begin_; - /// Text that closes a "versioned" namepace. + /// Text that closes a "versioned" namespace. ACE_CString versioning_end_; + /// Include for versioned namespace include + ACE_CString versioning_include_; + /// Client's header file name ending. Default is "C.h". char* client_hdr_ending_; |