diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-07-08 18:23:30 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2004-07-08 18:23:30 +0000 |
| commit | cf30382f937c8e39f864527bd44d5dffeb9cbaf6 (patch) | |
| tree | 46c18c938c5328b329ca4794d17bd06dd7bc2673 | |
| parent | 2b1b7afd08ceaf64ffdd442b589a01bfa6985340 (diff) | |
| download | ATCD-cf30382f937c8e39f864527bd44d5dffeb9cbaf6.tar.gz | |
ChangeLogTag: Thu Jul 8 18:23:12 UTC 2004 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 12 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_interface.cpp | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index 5776a83b82f..eda67b5de57 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -318,7 +318,7 @@ TAO_CodeGen::start_client_stubs (const char *fname) *this->client_stubs_ << "\n#include \"" << be_global->be_get_client_inline_fname (1) << "\""; - *this->client_stubs_ << "\n#endif /* !defined INLINE */"; + *this->client_stubs_ << "\n#endif /* !defined __ACE_INLINE__ */"; return 0; } @@ -646,7 +646,7 @@ TAO_CodeGen::start_server_skeletons (const char *fname) *this->server_skeletons_ << "#include \"" << be_global->be_get_server_inline_fname (1) << "\"\n"; - *this->server_skeletons_ << "#endif /* !defined INLINE */"; + *this->server_skeletons_ << "#endif /* !defined __ACE_INLINE__ */"; return 0; } @@ -707,7 +707,7 @@ TAO_CodeGen::start_server_template_skeletons (const char *fname) << "\n#include \"" << be_global->be_get_server_template_inline_fname (1) << "\""; - *this->server_template_skeletons_ << "\n#endif /* !defined INLINE */\n\n"; + *this->server_template_skeletons_ << "\n#endif /* !defined __ACE_INLINE__ */\n\n"; return 0; } @@ -962,7 +962,7 @@ TAO_CodeGen::end_client_header (void) *this->client_header_ << "#include \"" << be_global->be_get_client_inline_fname (1) << "\"\n"; - *this->client_header_ << "#endif /* defined INLINE */"; + *this->client_header_ << "#endif /* defined __ACE_INLINE__ */"; *this->client_header_ << "\n\n#if defined(_MSC_VER) && (_MSC_VER >= 1200)\n" << "#pragma warning(pop)\n" @@ -1007,7 +1007,7 @@ TAO_CodeGen::end_server_header (void) *this->server_header_ << "#include \"" << be_global->be_get_server_inline_fname (1) << "\"\n"; - *this->server_header_ << "#endif /* defined INLINE */"; + *this->server_header_ << "#endif /* defined __ACE_INLINE__ */"; *this->server_header_ << "\n\n#if defined(_MSC_VER) && (_MSC_VER >= 1200)\n" << "#pragma warning(pop)\n" @@ -1096,7 +1096,7 @@ TAO_CodeGen::end_server_template_header (void) << "\n#include \"" << be_global->be_get_server_template_inline_fname (1) << "\""; - *this->server_template_header_ << "\n#endif /* defined INLINE */"; + *this->server_template_header_ << "\n#endif /* defined __ACE_INLINE__ */"; // Insert the code to include the template source file. *this->server_template_header_ diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 330374225dd..d6086f7223d 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -773,7 +773,8 @@ be_interface::gen_operation_table (const char *flat_name, os->indent (); // Start the table generation. - *os << "static const TAO_operation_db_entry " << flat_name + *os << be_nl << be_nl + << "static const TAO_operation_db_entry " << flat_name << "_operations [] = {" << be_idt_nl; // Make sure the queues are empty. |