diff options
Diffstat (limited to 'TAO/TAO_IDL/be')
-rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 28 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 77 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp | 1 |
3 files changed, 2 insertions, 104 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 715ce0199e2..caa96561985 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -1795,23 +1795,9 @@ TAO_CodeGen::end_server_template_header () // Insert the code to include the template source file. *this->server_template_header_ - << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)"; - *this->server_template_header_ << be_nl << "#include \"" << be_global->be_get_server_template_skeleton_fname (true) << "\""; - *this->server_template_header_ << be_nl - << "#endif /* defined REQUIRED SOURCE */"; - - // Insert the code to include the template pragma. - *this->server_template_header_ - << be_nl_2 << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)"; - *this->server_template_header_ - << be_nl << "#pragma implementation (\"" - << be_global->be_get_server_template_skeleton_fname (true) - << "\")"; - *this->server_template_header_ << be_nl - << "#endif /* defined REQUIRED PRAGMA */"; // Code to put the last #endif. *this->server_template_header_ << "\n\n"; @@ -1916,18 +1902,9 @@ int TAO_CodeGen::end_ciao_svnt_template_header () { *this->ciao_svnt_template_header_ << be_nl_2 - << "#if defined (ACE_TEMPLATES_REQUIRE_SOURCE)" - << be_nl << "#include \"" - << be_global->be_get_ciao_tmpl_svnt_src_fname (true) - << "\"" << be_nl - << "#endif /* ACE_TEMPLATES_REQUIRE_SOURCE */" - << be_nl_2 - << "#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA)" - << be_nl << "#pragma implementation (\"" + << "#include \"" << be_global->be_get_ciao_tmpl_svnt_src_fname (true) - << "\")" - << be_nl << "#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */" - << be_nl; + << "\"" << be_nl; if (be_global->post_include () != nullptr) { @@ -2768,7 +2745,6 @@ TAO_CodeGen::gen_stub_src_includes () if (be_global->gen_amh_classes ()) { - // Necessary for the AIX compiler. this->gen_standard_include (this->client_stubs_, "ace/Auto_Ptr.h"); } diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 2e79519140c..2eebde2ba5c 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -2012,20 +2012,10 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) tao_cg->gperf_input_stream ()->file () = nullptr; // Open the temp file. -#if defined (ACE_OPENVMS) - //FUZZ: disable check_for_lack_ACE_OS - ACE_HANDLE input = ::open (tao_cg->gperf_input_filename (), - O_RDONLY, - "shr=get,put,upd", - "ctx=rec", - "fop=dfw"); - //FUZZ: enable check_for_lack_ACE_OS -#else ACE_HANDLE input = ACE::open_temp_file ( ACE_TEXT_CHAR_TO_TCHAR (tao_cg->gperf_input_filename ()), O_RDONLY); -#endif if (input == ACE_INVALID_HANDLE) { @@ -2038,40 +2028,16 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) -1); } -#ifndef ACE_OPENVMS // Flush the output stream. Gperf also uses it as output. Ensure // current contents are written before gperf writes. ACE_OS::fflush (tao_cg->server_skeletons ()->file ()); -#endif /* !ACE_OPENVMS */ // Stdout is server skeleton. Do *not* close the file, just open // again with <ACE_OS::open> with WRITE + APPEND option.. After // this, remember to update the file offset to the correct location. - -#if defined (ACE_OPENVMS) - char* gperfOutput = ACE_OS::tempnam (0, "idl_"); - - if (gperfOutput == 0) - { - ACE_OS::close (input); - ACE_ERROR_RETURN ((LM_ERROR, - ACE_TEXT ("failed to allocate memory\n")), - -1); - } - - //FUZZ: disable check_for_lack_ACE_OS - ACE_HANDLE output = ::open (gperfOutput, - O_WRONLY | O_CREAT | O_EXCL, - ACE_DEFAULT_FILE_PERMS, - "shr=get,put,upd", - "ctx=rec", - "fop=dfw"); - //FUZZ: enable check_for_lack_ACE_OS -#else ACE_HANDLE output = ACE_OS::open (be_global->be_get_server_skeleton_fname (), O_WRONLY | O_APPEND); -#endif if (output == ACE_INVALID_HANDLE) { @@ -2207,49 +2173,6 @@ be_interface::gen_gperf_lookup_methods (const char *flat_name) ACE_OS::close (output); ACE_OS::close (input); -#if defined (ACE_OPENVMS) - ACE_OS::unlink (tao_cg->gperf_input_filename ()); - process_options.release_handles (); - - if (result != -1) - { - FILE* gperfOutputFile = ACE_OS::fopen (gperfOutput, "r"); - - if (gperfOutputFile == 0) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error:%p: Couldn't open ") - ACE_TEXT ("gperf output file\n"), - "fopen")); - result = -1; - } - else - { - FILE* out = tao_cg->server_skeletons ()->file (); - int c; - - while ((c = ACE_OS::fgetc(gperfOutputFile)) != EOF) - { - ACE_OS::fputc (c, out); - } - - if (ferror (gperfOutputFile) || ferror (out)) - { - ACE_ERROR ((LM_ERROR, - ACE_TEXT ("Error:%p: Couldn't open ") - ACE_TEXT ("gperf output file\n"), - "get/put")); - result = -1; - } - - ACE_OS::fclose (gperfOutputFile); - } - } - - ACE_OS::unlink (gperfOutput); - ACE_OS::free (gperfOutput); -#endif /* ACE_OPENVMS */ - return result; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp index 9ba14e43e27..b08822dc090 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -65,7 +65,6 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << node->name () << "_ptr p)" << be_nl << "{" << be_idt_nl; - // Workaround for broken HP V7.4-004 on OpenVMS IA83 if (node->has_mixed_parentage ()) { *os << "::CORBA::AbstractBase_ptr abs = p;" << be_nl |