diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-16 22:37:14 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-16 22:37:14 +0000 |
| commit | 1c3748a527c7166994da33fb45c573eb41dbf3b6 (patch) | |
| tree | 66055526e771743ff6ff91d2f0f67d4e8b861ba6 | |
| parent | 2c7423c9f051ce1ec3a819c289fb35d0365d4fb4 (diff) | |
| download | ATCD-1c3748a527c7166994da33fb45c573eb41dbf3b6.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/TAO_IDL/be/be_valuetype.cpp | 41 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp | 4 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp | 4 |
3 files changed, 24 insertions, 25 deletions
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 60445e0aebc..1ac85c20b85 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -354,39 +354,38 @@ idl_bool be_valuetype::have_supported_op (be_interface * node) { - idl_bool have_supported_op = 0; + idl_bool have_supported_op = 0; if (node->nmembers () == 0) { return I_FALSE; } - // Initialize an iterator for supported interface elements - for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); + // Initialize an iterator for supported interface elements + for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); si.is_done (); si.next()) - { - AST_Decl *d = si.item (); - - if (!d) - { - ACE_ERROR_RETURN ((LM_ERROR, - "(%N:%l) be_valuetype::" - "have_supported_op" - "bad node in this scope\n"), - 0); + { + AST_Decl *d = si.item (); - } + if (!d) + { + ACE_ERROR_RETURN ((LM_ERROR, + "(%N:%l) be_valuetype::" + "have_supported_op" + "bad node in this scope\n"), + 0); + } - AST_Decl::NodeType nt = d->node_type (); + AST_Decl::NodeType nt = d->node_type (); // Check the type of each element in the supported interface - if (nt == AST_Decl::NT_op || nt == AST_Decl::NT_attr) - { - have_supported_op = 1; - break; - } - } // end for loop + if (nt == AST_Decl::NT_op || nt == AST_Decl::NT_attr) + { + have_supported_op = 1; + break; + } + } // end for loop if (! have_supported_op) { diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp index b36c0b3bceb..99981b763b0 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/struct_typecode.cpp @@ -38,7 +38,7 @@ TAO::be_visitor_struct_typecode::visit_structure (AST_Structure * node) + node->flat_name ()); // Generate array containing struct field characteristics. - os << "static TAO::TypeCode::Field<char const *> const " + os << "static TAO::TypeCode::Struct_Field<char const *> const " << fields_name.c_str () << "[] =" << be_idt_nl << "{" << be_idt_nl; @@ -52,7 +52,7 @@ TAO::be_visitor_struct_typecode::visit_structure (AST_Structure * node) // Generate the TypeCode instantiation. os << "static TAO::TypeCode::Struct<char const *," << be_nl - << " TAO::TypeCode::Field<char const *> const *," << be_nl + << " TAO::TypeCode::Struct_Field<char const *> const *," << be_nl << " CORBA::tk_" << (this->is_exception_ ? "except" : "struct") << "," << be_nl << " TAO::Null_RefCount_Policy> const" diff --git a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp index 111fdd42015..7f0a7b3b092 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp @@ -161,8 +161,8 @@ TAO::be_visitor_value_typecode::visit_members (be_valuetype * node) -1); }; - os - << + os + << << " }"; |