diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-07 17:29:26 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-07 17:29:26 +0000 |
| commit | 9c182991d614cac534272a01b920deea65a0b629 (patch) | |
| tree | d28eaf49d3cdbae6df8b491c4f76e4a03491d1cb /TAO/TAO_IDL/be_include | |
| parent | ff95fd3ec79c66bee47e2eb08301a369020993b6 (diff) | |
| download | ATCD-9c182991d614cac534272a01b920deea65a0b629.tar.gz | |
Wed Sep 7 17:27:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>
* MPC/modules/IDLHelper.pm:
* 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 skel_export_file and stub_export_file to define an explicit
filename for these export files that are different than the stub/skel
export_include which could be a full path. This fixes bugzilla 3980
Diffstat (limited to 'TAO/TAO_IDL/be_include')
| -rw-r--r-- | TAO/TAO_IDL/be_include/be_global.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index a7c0397d4ed..cdb382f7526 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -255,6 +255,14 @@ public: //// export macro definition. void skel_export_include (const char* s); + //// Returns the name of the include file that will be generated for the + //// server side export macro definition. + const char* skel_export_file (void) const; + + //// Set the name of the include file that the will be generated for server + //// side export macro definition. + void skel_export_file (const char* s); + //// Returns the macro name for exporting client side classes in Win32 //// DLL. const char* stub_export_macro (void) const; @@ -270,6 +278,14 @@ public: //// export macro definition. void stub_export_include (const char* s); + //// Returns the name of the include file will be generated for the client + //// side export macro definition. + const char* stub_export_file (void) const; + + //// Set the name of the include file that will be generated for the client + //// side export macro definition. + void stub_export_file (const char* s); + //// Returns the macro name for exporting *A.h file classes in Win32 //// DLL. const char* anyop_export_macro (void) const; @@ -883,8 +899,10 @@ private: // Macros and includes used to export classes from generated code. char* skel_export_macro_; char* skel_export_include_; + char* skel_export_file_; char* stub_export_macro_; char* stub_export_include_; + char* stub_export_file_; // Macro and include used on ORB .pidl files generating to the // AnyTypeCode library. |