diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-03 21:02:32 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2011-10-03 21:02:32 +0000 |
| commit | 4dcca24c609008f9fe8a4e01966702b8f4c08e61 (patch) | |
| tree | 6bf00b87749636ef3ea7ec22a9b13d4dd2597378 /TAO_IDL/be/be_codegen.cpp | |
| parent | 8c7cc4d18ddf28a18a01fef53aaea68422b2fff2 (diff) | |
| download | ATCD-alt_mapping_SAIC.tar.gz | |
Merged version 94552 from main trunk into this branchalt_mapping_SAIC
Diffstat (limited to 'TAO_IDL/be/be_codegen.cpp')
| -rw-r--r-- | TAO_IDL/be/be_codegen.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/TAO_IDL/be/be_codegen.cpp b/TAO_IDL/be/be_codegen.cpp index 2f39a2464c0..42be59781cf 100644 --- a/TAO_IDL/be/be_codegen.cpp +++ b/TAO_IDL/be/be_codegen.cpp @@ -1976,11 +1976,11 @@ void TAO_CodeGen::gen_export_files (void) { if (be_global->gen_stub_export_hdr_file () - && be_global->stub_export_macro () != 0 - && be_global->stub_export_include () != 0) + && be_global->stub_export_macro () != 0 + && (be_global->stub_export_include () != 0 || be_global->stub_export_file () != 0)) { this->gen_export_file ( - be_global->stub_export_include (), + (be_global->stub_export_file () != 0) ? be_global->stub_export_file () : be_global->stub_export_include (), be_global->stub_export_macro (), "stub"); } @@ -1990,7 +1990,7 @@ TAO_CodeGen::gen_export_files (void) && be_global->skel_export_include () != 0) { this->gen_export_file ( - be_global->skel_export_include (), + (be_global->skel_export_file () != 0) ? be_global->skel_export_file () : be_global->skel_export_include (), be_global->skel_export_macro (), "skel", true); @@ -2335,8 +2335,6 @@ TAO_CodeGen::gen_stub_hdr_includes (void) this->client_header_ ); - // Conditionally included. - // DDS/DCPS zero-copy read sequence type support. if (idl_global->dcps_support_zero_copy_read ()) { |