diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-16 22:40:10 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2005-03-16 22:40:10 +0000 |
| commit | 5c5227af6bf5b8cab821d02e610e0e2bb85f70c7 (patch) | |
| tree | 53447a13b1b38e33838ee700de4200ee012adaac | |
| parent | 1c3748a527c7166994da33fb45c573eb41dbf3b6 (diff) | |
| download | ATCD-5c5227af6bf5b8cab821d02e610e0e2bb85f70c7.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/TAO_IDL/be/be_valuetype.cpp | 16 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp | 2 |
2 files changed, 10 insertions, 8 deletions
diff --git a/TAO/TAO_IDL/be/be_valuetype.cpp b/TAO/TAO_IDL/be/be_valuetype.cpp index 1ac85c20b85..c1a915a9d55 100644 --- a/TAO/TAO_IDL/be/be_valuetype.cpp +++ b/TAO/TAO_IDL/be/be_valuetype.cpp @@ -225,8 +225,8 @@ be_valuetype::determine_factory_style (void) // Initialize an iterator to iterate thru our scope // Continue until each element is visited. for (UTL_ScopeActiveIterator si (this, - UTL_Scope::IK_decls); - !si.is_done (); + UTL_Scope::IK_decls); + !si.is_done (); si.next()) { AST_Decl *d = si.item (); @@ -286,8 +286,8 @@ be_valuetype::have_operation (void) // Initialize an iterator to iterate thru our scope // Continue until each element is checked. for (UTL_ScopeActiveIterator si (this, - UTL_Scope::IK_decls); - !si.is_done (); + UTL_Scope::IK_decls); + !si.is_done (); si.next()) { AST_Decl *d = si.item (); @@ -342,7 +342,7 @@ be_valuetype::have_operation (void) if (intf != 0) { - have_operation = be_valuetype::have_supported_op (intf); + have_operation = be_valuetype::have_supported_op (intf); } } } @@ -362,7 +362,7 @@ be_valuetype::have_supported_op (be_interface * node) } // Initialize an iterator for supported interface elements - for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); + for (UTL_ScopeActiveIterator si (node, UTL_Scope::IK_decls); si.is_done (); si.next()) { @@ -374,7 +374,7 @@ be_valuetype::have_supported_op (be_interface * node) "(%N:%l) be_valuetype::" "have_supported_op" "bad node in this scope\n"), - 0); + 0); } AST_Decl::NodeType nt = d->node_type (); @@ -629,7 +629,7 @@ idl_bool be_valuetype::in_recursion (ACE_Unbounded_Queue<AST_Type *> &list) { list.enqueue_tail (this); - + for (UTL_ScopeActiveIterator si (this, UTL_Scope::IK_decls); !si.is_done (); si.next()) 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 7f0a7b3b092..2cb30286172 100644 --- a/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typecode/value_typecode.cpp @@ -34,6 +34,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node) size_t const count = node->data_members_count (); + /* if (count == 1 && count == node->nmembers () // Verify no operations. && node->n_inherits () == 0) @@ -66,6 +67,7 @@ TAO::be_visitor_value_typecode::visit_valuetype (be_valuetype * node) << be_uidt_nl; } else + */ { std::string const fields_name (std::string ("_tao_fields_") + node->flat_name ()); |