diff options
| author | msmit <msmit@remedy.nl> | 2011-12-05 18:44:56 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2011-12-05 18:44:56 +0000 |
| commit | 570b10927002eb5e83acaf142b97aade8549d191 (patch) | |
| tree | 0b91326efab579b9c691607d500d05e7f5bd5a8e | |
| parent | b8f56cc25958e4018422b3d8318c5af18aa985ce (diff) | |
| download | ATCD-570b10927002eb5e83acaf142b97aade8549d191.tar.gz | |
Mon Dec 5 18:43:32 UTC 2011 Marcel Smit <msmit@remedy.nl>
* TAO_IDL/be/be_codegen.cpp:
* TAO_IDL/be/be_global.cpp:
* TAO_IDL/be/be_produce.cpp:
Reduced the restrictions for generating an executor servant.
| -rw-r--r-- | TAO/ChangeLog.BRANCH | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_global.cpp | 2 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_produce.cpp | 2 |
4 files changed, 10 insertions, 5 deletions
diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH index 5c897831ff5..9301002d999 100644 --- a/TAO/ChangeLog.BRANCH +++ b/TAO/ChangeLog.BRANCH @@ -1,3 +1,10 @@ +Mon Dec 5 18:43:32 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_codegen.cpp: + * TAO_IDL/be/be_global.cpp: + * TAO_IDL/be/be_produce.cpp: + Reduced the restrictions for generating an executor servant. + Mon Dec 5 16:08:50 UTC 2011 Marcel Smit <msmit@remedy.nl> * TAO_IDL/be/be_codegen.cpp: diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 9ba481f1439..a56bf380792 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1421,7 +1421,6 @@ TAO_CodeGen::start_ciao_exec_svnt (const char *fname) ACE_NEW_RETURN (this->ciao_exec_svnt_, TAO_OutStream, -1); - int status = this->ciao_exec_svnt_->open (fname, TAO_OutStream::CIAO_EXEC_SVNT); @@ -1463,8 +1462,7 @@ TAO_CodeGen::start_ciao_exec_svnt (const char *fname) << "# pragma once\n" << "#endif /* ACE_LACKS_PRAGMA_ONCE */\n"; - // detect from the pragma's whether an _T has been created - if (be_global->gen_ciao_svnt () || !idl_global->ciao_lem_file_names().is_empty()) + if (be_global->gen_ciao_svnt ()) { *this->ciao_exec_svnt_ << be_nl diff --git a/TAO/TAO_IDL/be/be_global.cpp b/TAO/TAO_IDL/be/be_global.cpp index 05c7230e998..552923a250f 100644 --- a/TAO/TAO_IDL/be/be_global.cpp +++ b/TAO/TAO_IDL/be/be_global.cpp @@ -82,7 +82,7 @@ BE_GlobalData::BE_GlobalData (void) ciao_exec_src_ending_ (ACE::strnew ("_exec.cpp")), ciao_exec_stub_hdr_ending_ (ACE::strnew ("EC.h")), ciao_exec_idl_ending_ (ACE::strnew ("E.idl")), - ciao_exec_svnt_ending_ (ACE::strnew ("_svnt.h")), + ciao_exec_svnt_ending_ (ACE::strnew ("E_svnt.h")), ciao_conn_hdr_ending_ (ACE::strnew ("_conn.h")), ciao_conn_src_ending_ (ACE::strnew ("_conn.cpp")), dds_typesupport_hdr_ending_ (ACE::strnew ("Support.h")), diff --git a/TAO/TAO_IDL/be/be_produce.cpp b/TAO/TAO_IDL/be/be_produce.cpp index e51a7411fee..d3268ce24d9 100644 --- a/TAO/TAO_IDL/be/be_produce.cpp +++ b/TAO/TAO_IDL/be/be_produce.cpp @@ -224,7 +224,7 @@ BE_produce (void) BE_visit_root (root_svs_visitor, "CIAO servant source"); } // if a servant need to be created or when explicitly a #pragma ciao lem is defined. - if (be_global->gen_ciao_svnt () || !idl_global->ciao_lem_file_names().is_empty()) + if (be_global->gen_ciao_svnt ()) { ctx.state (TAO_CodeGen::TAO_ROOT_SVTH); be_visitor_root_svth root_svth_visitor (&ctx); |