diff options
| -rw-r--r-- | TAO/ChangeLog-98c | 24 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_codegen.cpp | 10 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_operation.cpp | 11 |
3 files changed, 24 insertions, 21 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index e2d30c20894..43a2d06fdb4 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -10,21 +10,23 @@ Sun Oct 26 01:05:36 1997 <nw1@COYOTE> Sun Oct 26 01:47:04 1997 Sergio Flores <sergio@macarena.cs.wustl.edu> + * TAO_IDL/be/be_codegen.cpp (upcase): + * TAO_IDL/util/utl_string.cpp (canonicalize): * TAO_IDL/be/be_decl.cpp (tc_name2long): Added "unsigned" to index variable "i" used in for() loop, to avoid warning "comparison between unsigned and signed" * TAO_IDL/be/be_decl.cpp (compute_flatname): * TAO_IDL/be/be_decl.cpp (compute_repoID): + * TAO_IDL/be/be_interface.cpp (compute_fullskelname): Fixed error "second - I_FALSE;", should be "second = I_FALSE;" - * TAO_IDL/be/be_decl.cpp (be_decl): - Reordered member initializers to match declaration order to - satisfy the compiler. - + * TAO_IDL/be/be_operation.cpp (gen_server_skeletons): * TAO_IDL/be/be_state.cpp (gen_code): Initialized pointers to 0 + * TAO_IDL/be/be_operation.cpp (gen_server_header): + * TAO_IDL/be/be_operation.cpp (gen_client_header): * TAO_IDL/be/be_decl.cpp (gen_out_defn): * TAO_IDL/be/be_decl.cpp (gen_var_defn): * TAO_IDL/be/be_scope.cpp (gen_client_header): @@ -59,23 +61,15 @@ Sun Oct 26 01:47:04 1997 Sergio Flores <sergio@macarena.cs.wustl.edu> Added ACE_UNUSED_ARG macro to avoid unused variable warning, for variable slen. - * TAO_IDL/be/be_interface.cpp (compute_fullskelname): - Fixed error "second - I_FALSE;"; should be "second = I_FALSE;" - * TAO_IDL/be_include/be_helper.h (class TAO_OutStream): Made destructor virtual; we have virtual member functions. - * TAO_IDL/util/utl_string.cpp (canonicalize): - Added "unsigned" to index variable "i" used in for() loop, - to avoid warning "comparison between unsigned and signed" - + * TAO_IDL/be/be_codegen.cpp (TAO_CodeGen): + * TAO_IDL/be/be_decl.cpp (be_decl): * TAO_IDL/util/utl_stack.cpp (UTL_ScopeStack): - Reordered member initializers to match declaration order to - satisfy the compiler. - * TAO_IDL/util/utl_scope.cpp (UTL_ScopeActiveIterator): Reordered member initializers to match declaration order to - eliminate warnings from the compiler. + satisfy the compiler. * TAO_IDL/util/utl_scope.cpp (lookup_primitive_type): Added "default" case to switch to return NULL. diff --git a/TAO/TAO_IDL/be/be_codegen.cpp b/TAO/TAO_IDL/be/be_codegen.cpp index d22441f1150..9e0359a790b 100644 --- a/TAO/TAO_IDL/be/be_codegen.cpp +++ b/TAO/TAO_IDL/be/be_codegen.cpp @@ -24,15 +24,15 @@ static const int CHUNK = 100; /* BE global Data */ TAO_CodeGen::TAO_CodeGen (void) : client_header_ (0), - server_header_ (0), client_stubs_ (0), - server_skeletons_ (0), client_inline_ (0), + server_header_ (0), + server_skeletons_ (0), server_inline_ (0), curr_os_ (0), state_ (new TAO_CodeGen::CG_STATE [CHUNK]), - size_ (CHUNK), - top_ (0) + top_ (0), + size_ (CHUNK) { // set the current code generation state this->state_ [this->top_++] = TAO_CodeGen::TAO_INITIAL; @@ -106,7 +106,7 @@ TAO_CodeGen::upcase (const char *str) ACE_OS::memset (upcase_str, '\0', MAXNAMELEN); // convert letters in str to upcase - for (int i=0; i < ACE_OS::strlen (str); i++) + for (unsigned int i=0; i < ACE_OS::strlen (str); i++) { if (isalpha (str [i])) { diff --git a/TAO/TAO_IDL/be/be_operation.cpp b/TAO/TAO_IDL/be/be_operation.cpp index 347ac5482c4..ca6b2c09235 100644 --- a/TAO/TAO_IDL/be/be_operation.cpp +++ b/TAO/TAO_IDL/be/be_operation.cpp @@ -52,6 +52,9 @@ be_operation::gen_client_header (void) be_type *bt; // type node be_state *s; // state based code gen object + // Macro to avoid "warning: unused parameter" type warning. + ACE_UNUSED_ARG (nl); + // retrieve a singleton instance of the code generator TAO_CodeGen *cg = TAO_CODEGEN::instance (); cg->push (TAO_CodeGen::TAO_OPERATION_CH); // we are now generating an operation @@ -334,6 +337,12 @@ be_operation::gen_server_header (void) be_argument *bd; // argument node be_state *s; // state based code generator object + // Macro to avoid "warning: unused parameter" type warning. + ACE_UNUSED_ARG (nl); + ACE_UNUSED_ARG (si); + ACE_UNUSED_ARG (d); + ACE_UNUSED_ARG (bd); + // retrieve a singleton instance of the code generator TAO_CodeGen *cg = TAO_CODEGEN::instance (); cg->push (TAO_CodeGen::TAO_OPERATION_SH); // we are now generating an operation @@ -395,7 +404,7 @@ be_operation::gen_server_skeletons (void) be_type *rt; // type node for the return type UTL_ScopeActiveIterator *si; // scope iterator AST_Decl *d; // temp node - be_argument *bd; // argument node + be_argument *bd = 0; // argument node be_state *s; // state based code gen object be_predefined_type *bpd=0; // predefined return type be_interface *intf; // enclosing interface node |