diff options
Diffstat (limited to 'TAO')
855 files changed, 3998 insertions, 3948 deletions
diff --git a/TAO/TAO_IDL/be/be_component.cpp b/TAO/TAO_IDL/be/be_component.cpp index 28b866663db..5262752f986 100644 --- a/TAO/TAO_IDL/be/be_component.cpp +++ b/TAO/TAO_IDL/be/be_component.cpp @@ -364,18 +364,12 @@ be_component::gen_is_a_ancestors (TAO_OutStream *os) while (ancestor != nullptr) { - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"" << ancestor->repoID () << "\"" << be_uidt_nl - << ") == 0 ||" << be_uidt_nl; + *os << "std::strcmp (value, \"" << ancestor->repoID () << "\") == 0 ||" << be_nl; ancestor = ancestor->base_component (); } - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/Components/CCMObject:1.0\"" << be_uidt_nl - << ") == 0" << be_uidt << be_uidt_nl; + *os << "std::strcmp (value, \"IDL:omg.org/Components/CCMObject:1.0\") == 0" << be_nl; return 0; } diff --git a/TAO/TAO_IDL/be/be_interface.cpp b/TAO/TAO_IDL/be/be_interface.cpp index 7cb827f423c..ba3b0ce5ff0 100644 --- a/TAO/TAO_IDL/be/be_interface.cpp +++ b/TAO/TAO_IDL/be/be_interface.cpp @@ -2309,10 +2309,7 @@ be_interface::is_a_helper (be_interface * /*derived*/, TAO_OutStream *os) { // Emit the comparison code. - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"" << bi->repoID () << "\"" << be_uidt_nl - << ") == 0 ||" << be_uidt_nl; + *os << "std::strcmp (value, \"" << bi->repoID () << "\") == 0 ||" << be_nl; return 0; } @@ -2756,34 +2753,25 @@ be_interface::gen_is_a_ancestors (TAO_OutStream *os) if (this->is_abstract () || this->has_mixed_parentage ()) { - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/AbstractBase:1.0\"" << be_uidt_nl - << ") == 0"; + *os << "std::strcmp (value, \"IDL:omg.org/CORBA/AbstractBase:1.0\") == 0"; } else if (this->is_local ()) { - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/LocalObject:1.0\"" << be_uidt_nl - << ") == 0"; + *os << "std::strcmp (value, \"IDL:omg.org/CORBA/LocalObject:1.0\") == 0"; } if (this->has_mixed_parentage () || this->is_local ()) { - *os << " ||" << be_uidt_nl; + *os << " ||" << be_nl; } else if (this->is_abstract ()) { - *os << be_uidt << be_uidt_nl; + *os << be_nl; } if (! this->is_abstract ()) { - *os << "std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl - << ") == 0" << be_uidt << be_uidt_nl; + *os << "std::strcmp (value, \"IDL:omg.org/CORBA/Object:1.0\") == 0" << be_nl; } return 0; diff --git a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp index 37873af1783..731e32bb18d 100644 --- a/TAO/TAO_IDL/be/be_visitor_attr_return.cpp +++ b/TAO/TAO_IDL/be/be_visitor_attr_return.cpp @@ -114,7 +114,7 @@ be_visitor_attr_return::visit_predefined_type ( << this->attr_name_string_.c_str () << ".in ());"; break; case AST_PredefinedType::PT_any: - os_ << "::CORBA::Any * retval = 0;" << be_nl + os_ << "::CORBA::Any * retval {};" << be_nl << "ACE_NEW_RETURN (" << be_idt_nl << "retval," << be_nl << "::CORBA::Any (" diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp index b27b9fc6642..854c2c0f2c3 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exs.cpp @@ -112,7 +112,7 @@ be_visitor_component_ami_rh_exs::visit_operation ( if (count == 0 && vrt) { - os_ << "void)"; + os_ << ")"; } else { diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp index 347b10ee719..3b1355474cb 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp @@ -192,7 +192,7 @@ be_visitor_context_svts::visit_publishes (be_publishes *node) os_ << be_nl << be_nl - << "::Components::Cookie * retv = 0;" << be_nl + << "::Components::Cookie * retv {};" << be_nl << "ACE_NEW_THROW_EX (retv," << be_nl << " ::CIAO::Cookie_Impl (ptr)," << be_nl @@ -397,7 +397,7 @@ be_visitor_context_svts::gen_uses_multiplex ( << " 0);" << be_nl_2; os_ << "::" << node_->full_name () << "::" << port_name - << "Connections * tmp_retv = 0;" << be_nl + << "Connections * tmp_retv {};" << be_nl << "ACE_NEW_THROW_EX (tmp_retv," << be_nl << " ::" << node_->full_name () << "::" << port_name << "Connections (" << be_nl @@ -465,7 +465,7 @@ be_visitor_context_svts::gen_uses_multiplex ( << "}"; os_ << be_nl_2 - << "::Components::Cookie * ck = 0;" << be_nl + << "::Components::Cookie * ck {};" << be_nl << "ACE_NEW_THROW_EX (ck," << be_nl << " ::CIAO::Cookie_Impl (ptr)," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp index c1a7263238c..d2d93264f93 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp @@ -208,7 +208,7 @@ be_visitor_executor_exs::visit_component (be_component *node) << "ACE_Reactor*" << be_nl << lname << "_exec_i::reactor ()" << be_nl << "{" << be_idt_nl - << "ACE_Reactor* reactor = 0;" << be_nl + << "ACE_Reactor* reactor {};" << be_nl << "::CORBA::Object_var ccm_object = " << be_idt_nl << "this->ciao_context_->get_CCM_object();" << be_uidt_nl << "if (! ::CORBA::is_nil (ccm_object.in ())) " << be_idt_nl @@ -357,7 +357,7 @@ be_visitor_executor_exs::visit_provides (be_provides *node) << "if ( ::CORBA::is_nil (this->ciao_" << port_name << "_.in ()))" << be_idt_nl << "{" << be_idt_nl - << lname << "_exec_i *tmp = 0;" << be_nl + << lname << "_exec_i *tmp {};" << be_nl << "ACE_NEW_RETURN (" << be_idt_nl << "tmp," << be_nl << lname << "_exec_i (" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp index 391d75a5be1..3f081adcfb4 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -775,7 +775,7 @@ be_visitor_servant_svs::gen_publishes_top () << node_->local_name () << "_Servant::get_all_publishers ()" << be_nl << "{" << be_idt_nl - << "::Components::PublisherDescriptions *retval = 0;" + << "::Components::PublisherDescriptions *retval {};" << be_nl << "ACE_NEW_THROW_EX (retval," << be_nl << " ::Components::PublisherDescriptions," @@ -882,7 +882,7 @@ be_visitor_servant_svs::gen_uses_top () << node_->local_name () << "_Servant::get_all_receptacles ()" << be_nl << "{" << be_idt_nl - << "::Components::ReceptacleDescriptions * retval = 0;" + << "::Components::ReceptacleDescriptions * retval {};" << be_nl << "ACE_NEW_THROW_EX (retval," << be_nl << " ::Components::ReceptacleDescriptions," @@ -1003,7 +1003,7 @@ be_visitor_servant_svs::gen_get_all_emitters () << node_->local_name () << "_Servant::get_all_emitters ()" << be_nl << "{" << be_idt_nl - << "::Components::EmitterDescriptions *retval = 0;" + << "::Components::EmitterDescriptions *retval {};" << be_nl << "ACE_NEW_THROW_EX (retval," << be_nl << " ::Components::EmitterDescriptions," diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp index 94508097dd4..ad0751a4dad 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -61,7 +61,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) << node->local_name () << " ();" << be_nl << node->local_name () << " (const " << node->local_name () << " &);" << be_nl - << "~" << node->local_name () << " (void);\n" << be_nl; + << "~" << node->local_name () << " () = default;\n" << be_nl; // Assignment operator. *os << node->local_name () << " &operator= (const " diff --git a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp index fda3de5ef27..a25dc7fb3da 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -107,12 +107,6 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << "{" << be_nl; *os << "}" << be_nl_2; - // Destructor. - *os << node->name () << "::~" << node->local_name () - << " ()" << be_nl; - *os << "{" << be_nl; - *os << "}" << be_nl_2; - // Copy constructor. *os << node->name () << "::" << node->local_name () << " (const ::" << node->name () << " &_tao_excp)" << be_idt_nl; @@ -203,18 +197,18 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << "::CORBA::Exception *" << node->name () << "::_alloc ()" << be_nl; *os << "{" << be_idt_nl; - *os << "::CORBA::Exception *retval = 0;" << be_nl + *os << "::CORBA::Exception *retval {};" << be_nl << "ACE_NEW_RETURN (retval, ::" << node->name () - << ", 0);" << be_nl + << ", nullptr);" << be_nl << "return retval;" << be_uidt_nl; *os << "}" << be_nl_2; *os << "::CORBA::Exception *" << be_nl << node->name () << "::_tao_duplicate () const" << be_nl << "{" << be_idt_nl - << "::CORBA::Exception *result = 0;" << be_nl + << "::CORBA::Exception *result {};" << be_nl << "ACE_NEW_RETURN (result, " - << "::" << node->name () << " (*this), 0);" + << "::" << node->name () << " (*this), nullptr);" << be_nl << "return result;" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp index f79eafd2f91..e792b18f3c4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -71,7 +71,7 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) << "TAO_Stub *stub = this->_create_stub ();" << be_nl_2; *os << "TAO_Stub_Auto_Ptr safe_stub (stub);" << be_nl - << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();" << be_nl + << "::CORBA::Object_ptr tmp {};" << be_nl << be_nl << "::CORBA::Boolean _tao_opt_colloc =" << be_idt_nl << "stub->servant_orb_var ()->orb_core ()->" 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 8f681fbc85f..072a877ecad 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -308,7 +308,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) -1); } - *os << ")" << be_nl + *os << ")" << be_uidt_nl << "{" << be_idt_nl << "return true; // success using local knowledge" << be_uidt_nl << "}" << be_uidt_nl @@ -471,7 +471,7 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, } else { - *os << "return" << be_idt_nl; + *os << "return "; if (!node->is_abstract ()) { @@ -484,18 +484,17 @@ be_visitor_interface_cs::gen_xxx_narrow (const char *pre, << node->local_name () << ">::" << pre <<" ("; } - *os << be_idt << be_idt_nl - << "_tao_objref"; + *os << "_tao_objref"; if (ACE_OS::strcmp (pre, "narrow") == 0) { - *os << "," << be_nl + *os << ", " << "\"" << node->repoID () << "\""; } *os << ");"; - *os << be_uidt << be_uidt << be_uidt << be_uidt_nl + *os << be_uidt_nl << "}" << be_nl_2; } diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp index 1d778cd0081..81256400f5f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -114,8 +114,8 @@ be_visitor_interface_ss::visit_interface (be_interface *node) // Default constructor body. *os << "{" << be_idt_nl - << "this->optable_ = &tao_" << flat_name - << "_optable;" << be_uidt_nl + << "this->optable_ = std::addressof(tao_" << flat_name + << "_optable);" << be_uidt_nl << "}" << be_nl_2; // find if we are at the top scope or inside some module @@ -182,22 +182,15 @@ be_visitor_interface_ss::visit_interface (be_interface *node) -1); } - *os << "!std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/Object:1.0\"" << be_uidt_nl - << ")"; + *os << "std::strcmp (value, \"IDL:omg.org/CORBA/Object:1.0\") == 0"; if (node->has_mixed_parentage ()) { - *os << " ||" << be_uidt_nl - << "!std::strcmp (" << be_idt << be_idt_nl - << "value," << be_nl - << "\"IDL:omg.org/CORBA/AbstractBase:1.0\"" - << be_uidt_nl - << ")"; + *os << " ||" << be_nl + << "std::strcmp (value, \"IDL:omg.org/CORBA/AbstractBase:1.0\") == 0"; } - *os << be_uidt << be_uidt_nl + *os << be_uidt_nl << ");" << be_uidt << be_uidt_nl << "}" << be_nl_2; @@ -382,7 +375,7 @@ be_visitor_interface_ss::this_method (be_interface *node) /* Coverity whines about an unused return value from _nil() when initializing tmp. Just use zero instead. */ - *os << "::CORBA::Object_ptr tmp = CORBA::Object_ptr ();" + *os << "::CORBA::Object_ptr tmp {};" << be_nl_2; *os << "::CORBA::Boolean const _tao_opt_colloc =" diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp index de538be52bf..b073286e4d7 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_cs.cpp @@ -136,7 +136,7 @@ be_visitor_operation_ami_cs::visit_operation (be_operation *node) // type is void. No need to generate argument list. *os << be_nl_2 - << "TAO::Argument ** _the_tao_operation_signature = 0;"; + << "TAO::Argument ** _the_tao_operation_signature {};"; nargs = 0; // Don't count the reply handler. } else diff --git a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp index ede3ab5369e..8be04af15e1 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/ami_handler_reply_stub_operation_cs.cpp @@ -205,7 +205,7 @@ be_visitor_operation_ami_handler_reply_stub_operation_cs::visit_operation ( << "0);" << be_uidt << be_uidt_nl; - *os << "::Messaging::ExceptionHolder* exception_holder_ptr = 0;" << be_nl + *os << "::Messaging::ExceptionHolder* exception_holder_ptr {};" << be_nl << "ACE_NEW (" << be_idt << be_idt_nl << "exception_holder_ptr," << be_nl << "::TAO::ExceptionHolder (" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp index 7b8b075314c..fa546645e9b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -520,5 +520,5 @@ be_visitor_valuebox_field_ch::emit_member_get (be_decl *field, TAO_OutStream *os = this->ctx_->stream (); *os << const_prefix << field_type->name () << type_suffix << " " - << field->local_name () << " (void) " << const_method << ";" << be_nl; + << field->local_name () << " () " << const_method << ";" << be_nl; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp index 481adfd98b2..31bbb25ea69 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -589,7 +589,7 @@ be_visitor_valuebox_field_ci::emit_member_get (be_decl *field, *os << "ACE_INLINE " << const_prefix << field_type->name () << type_suffix << be_nl << vb_node_->name () << "::" << field->local_name () - << " (void) " << const_method << be_nl + << " () " << const_method << be_nl << "{" << be_idt_nl << "return this->_pd_value->" << field->local_name () << access_modifier << ";" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp index 7d3ad3438e5..562a4fa0dea 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/union_member_ci.cpp @@ -544,7 +544,7 @@ be_visitor_valuebox_union_member_ci::emit_member_get ( *os << "ACE_INLINE " << const_prefix << field_type->name () << type_suffix << be_nl << vb_node_->name () << "::" << field->local_name () - << " (void) " << const_method << be_nl + << " () " << const_method << be_nl << "{" << be_idt_nl << "return this->_pd_value->" << field->local_name () << " ();" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp index 16722cf0364..3047404a425 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/arglist.cpp @@ -79,7 +79,7 @@ be_visitor_obv_operation_arglist::visit_operation (be_operation *node) } else { - *os << "void)"; + *os << ")"; } be_visitor_context ctx = *this->ctx_; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp index cd93330c0d1..08e9c233fbc 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -243,8 +243,8 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) if (node->n_supports () > 0) { *os << be_uidt_nl << be_nl << "public:" << be_idt_nl; - *os << be_nl << "virtual void _add_ref (void) = 0;" << be_nl; - *os << "virtual void _remove_ref (void) = 0;" << be_nl; + *os << be_nl << "virtual void _add_ref () = 0;" << be_nl; + *os << "virtual void _remove_ref () = 0;" << be_nl; *os << "virtual ::CORBA::ValueBase *_tao_to_value ();"; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index cc4c7a339bf..f09a8cd5313 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -323,7 +323,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) << node->local_name () << " *&new_object" << be_uidt_nl << ")" << be_uidt_nl << "{" << be_idt_nl - << "::CORBA::ValueBase *base = 0;" << be_nl + << "::CORBA::ValueBase *base {};" << be_nl << "::CORBA::Boolean is_indirected = false;" << be_nl << "::CORBA::Boolean is_null_object = false;" << be_nl << "::CORBA::Boolean const retval =" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp index 478f369c7cc..86bdaea0b8e 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_arglist_ch.cpp @@ -49,7 +49,7 @@ be_visitor_valuetype_init_arglist_ch::visit_factory (be_factory *node) } else { - os << "void)"; + os << ")"; } return 0; diff --git a/TAO/TAO_IDL/be_include/be_argument.h b/TAO/TAO_IDL/be_include/be_argument.h index d51ffece6c6..cc5c2ef4bef 100644 --- a/TAO/TAO_IDL/be_include/be_argument.h +++ b/TAO/TAO_IDL/be_include/be_argument.h @@ -32,7 +32,7 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_array.h b/TAO/TAO_IDL/be_include/be_array.h index 75082a5c844..d021e5125be 100644 --- a/TAO/TAO_IDL/be_include/be_array.h +++ b/TAO/TAO_IDL/be_include/be_array.h @@ -31,7 +31,7 @@ public: bool local, bool abstract); - ~be_array (void); + ~be_array (); /// Generate dimensions. If slice == 1, generate dimensions for the slice /// definition. @@ -50,13 +50,13 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); protected: /// Create a name for us. - virtual int create_name (void); + virtual int create_name (); - virtual void compute_tc_name (void); + virtual void compute_tc_name (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_attribute.h b/TAO/TAO_IDL/be_include/be_attribute.h index fbbcae1ad5a..40f1ccf330a 100644 --- a/TAO/TAO_IDL/be_include/be_attribute.h +++ b/TAO/TAO_IDL/be_include/be_attribute.h @@ -31,13 +31,13 @@ public: bool abstract); // Non-virtual override of frontend method. - be_type *field_type (void) const; + be_type *field_type () const; // Visiting. virtual int accept (be_visitor *visitor); /// Cleanup. - virtual void destroy (void); + virtual void destroy (); /// Sets the original attribute from which this one was created, /// applies only to implied IDL. diff --git a/TAO/TAO_IDL/be_include/be_codegen.h b/TAO/TAO_IDL/be_include/be_codegen.h index abfa4b7cb1d..1369ca69e02 100644 --- a/TAO/TAO_IDL/be_include/be_codegen.h +++ b/TAO/TAO_IDL/be_include/be_codegen.h @@ -198,10 +198,10 @@ public: }; /// Constructor - TAO_CodeGen (void); + TAO_CodeGen (); /// Destructor - ~TAO_CodeGen (void); + ~TAO_CodeGen (); /// Set the client header stream. int start_client_header (const char *fname); @@ -249,16 +249,16 @@ public: /// Generate code at the end such as the <<= and >>= operators along /// with the ending #endif statement. - int end_client_header (void); + int end_client_header (); /// Generate necessary code at end of client inline file. - void end_client_inline (void); + void end_client_inline (); /// Generate necessary code at end of client stub file. - void end_client_stubs (void); + void end_client_stubs (); /// Put a last #endif in the server header. - int end_server_header (void); + int end_server_header (); /// Put a last #endif in the server header. int end_implementation_header (const char *fname); @@ -267,102 +267,102 @@ public: int end_implementation_skeleton (const char *fname); /// Put a last #endif in the server template header. - int end_server_template_header (void); + int end_server_template_header (); /// Put a last #endif in the server skeletons. - int end_server_template_skeletons (void); + int end_server_template_skeletons (); /// Put a last #endif in the server skeletons. - int end_server_skeletons (void); + int end_server_skeletons (); /// Put a last #endif in the anyop header. - int end_anyop_header (void); + int end_anyop_header (); /// Make sure we end with a newline. - int end_anyop_source (void); - - int end_ciao_svnt_header (void); - int end_ciao_svnt_source (void); - int end_ciao_svnt_template_header (void); - int end_ciao_svnt_template_source (void); - int end_ciao_exec_header (void); - int end_ciao_exec_source (void); - int end_ciao_exec_idl (void); - int end_ciao_conn_header (void); - int end_ciao_conn_source (void); - int end_ciao_ami_conn_idl (void); + int end_anyop_source (); + + int end_ciao_svnt_header (); + int end_ciao_svnt_source (); + int end_ciao_svnt_template_header (); + int end_ciao_svnt_template_source (); + int end_ciao_exec_header (); + int end_ciao_exec_source (); + int end_ciao_exec_idl (); + int end_ciao_conn_header (); + int end_ciao_conn_source (); + int end_ciao_ami_conn_idl (); /// Get the client header stream. - TAO_OutStream *client_header (void); + TAO_OutStream *client_header (); /// Get the client stubs stream. - TAO_OutStream *client_stubs (void); + TAO_OutStream *client_stubs (); /// Get the client inline stream. - TAO_OutStream *client_inline (void); + TAO_OutStream *client_inline (); /// get the server header stream. - TAO_OutStream *server_header (void); + TAO_OutStream *server_header (); /// Get the implementation header stream. - TAO_OutStream *implementation_header (void); + TAO_OutStream *implementation_header (); /// Get the implementation skeleton stream. - TAO_OutStream *implementation_skeleton (void); + TAO_OutStream *implementation_skeleton (); /// Get the server header template stream. - TAO_OutStream *server_template_header (void); + TAO_OutStream *server_template_header (); /// Get the server skeletons stream. - TAO_OutStream *server_skeletons (void); + TAO_OutStream *server_skeletons (); /// Get the server template skeletons stream. - TAO_OutStream *server_template_skeletons (void); + TAO_OutStream *server_template_skeletons (); /// Get the server template inline stream. - TAO_OutStream *server_template_inline (void); + TAO_OutStream *server_template_inline (); /// Get the anyop header stream. - TAO_OutStream *anyop_header (void); + TAO_OutStream *anyop_header (); /// Get the anyop source stream. - TAO_OutStream *anyop_source (void); + TAO_OutStream *anyop_source (); /// Get the CIAO servant header stream. - TAO_OutStream *ciao_svnt_header (void); + TAO_OutStream *ciao_svnt_header (); /// Get the CIAO servant source stream. - TAO_OutStream *ciao_svnt_source (void); + TAO_OutStream *ciao_svnt_source (); /// Get the CIAO template servant header stream. - TAO_OutStream *ciao_svnt_template_header (void); + TAO_OutStream *ciao_svnt_template_header (); /// Get the CIAO template servant source stream. - TAO_OutStream *ciao_svnt_template_source (void); + TAO_OutStream *ciao_svnt_template_source (); /// Get the CIAO executor impl header stream. - TAO_OutStream *ciao_exec_header (void); + TAO_OutStream *ciao_exec_header (); /// Get the CIAO executor impl source stream. - TAO_OutStream *ciao_exec_source (void); + TAO_OutStream *ciao_exec_source (); /// Get the CIAO executor IDL source stream. - TAO_OutStream *ciao_exec_idl (void); + TAO_OutStream *ciao_exec_idl (); /// Get the CIAO connector impl header stream. - TAO_OutStream *ciao_conn_header (void); + TAO_OutStream *ciao_conn_header (); /// Get the CIAO connector impl source stream. - TAO_OutStream *ciao_conn_source (void); + TAO_OutStream *ciao_conn_source (); /// Get the CIAO AMI connector IDL stream. - TAO_OutStream *ciao_ami_conn_idl (void); + TAO_OutStream *ciao_ami_conn_idl (); /// Set the gperf input file stream. void gperf_input_stream (TAO_OutStream *gperf_input); /// Retrieve the gperf input stream being used. - TAO_OutStream *gperf_input_stream (void); + TAO_OutStream *gperf_input_stream (); /// Set the gperf input file name. void gperf_input_filename (char *filename); @@ -373,7 +373,7 @@ public: * program. This is needed coz I do ACE_OS::open on this when I need * ACE_HANDLE for the file instead FILE*. */ - char *gperf_input_filename (void); + char *gperf_input_filename (); /// Convert input string to all one case. const char *upcase (const char *str); @@ -383,7 +383,7 @@ public: void gen_ident_string (TAO_OutStream *stream) const; /// Generates the export files selected on the command line. - void gen_export_files (void); + void gen_export_files (); /// Generate file include, with optional empty comment to /// short-circuit DOxygen. @@ -392,7 +392,7 @@ public: bool add_comment = false); /// Cleanup. - void destroy (void); + void destroy (); private: void gen_ifndef_string (const char *fname, @@ -401,13 +401,13 @@ private: const char *suffix); /// Utility methods for generating file includes. - void gen_stub_hdr_includes (void); - void gen_stub_src_includes (void); - void gen_skel_hdr_includes (void); - void gen_skel_src_includes (void); - void gen_seq_file_includes (void); + void gen_stub_hdr_includes (); + void gen_stub_src_includes (); + void gen_skel_hdr_includes (); + void gen_skel_src_includes (); + void gen_seq_file_includes (); void gen_any_file_includes (TAO_OutStream * stream) ; - void gen_var_file_includes (void); + void gen_var_file_includes (); void gen_stub_arg_file_includes (TAO_OutStream * stream); void gen_skel_arg_file_includes (TAO_OutStream * stream); void gen_cond_file_include (bool condition_green, @@ -419,12 +419,12 @@ private: void gen_svnt_hdr_includes (TAO_OutStream *stream); void gen_svnt_src_includes (TAO_OutStream *stream); void gen_svnt_tmpl_hdr_includes (TAO_OutStream *stream); - void gen_exec_hdr_includes (void); - void gen_exec_src_includes (void); - void gen_exec_idl_includes (void); - void gen_conn_hdr_includes (void); - void gen_conn_src_includes (void); - void gen_ami_conn_idl_includes (void); + void gen_exec_hdr_includes (); + void gen_exec_src_includes (); + void gen_exec_idl_includes (); + void gen_conn_hdr_includes (); + void gen_conn_src_includes (); + void gen_ami_conn_idl_includes (); bool is_system_file (const char * idl_name) const; diff --git a/TAO/TAO_IDL/be_include/be_component.h b/TAO/TAO_IDL/be_include/be_component.h index 94e7ec69dac..09766163811 100644 --- a/TAO/TAO_IDL/be_include/be_component.h +++ b/TAO/TAO_IDL/be_include/be_component.h @@ -33,17 +33,17 @@ public: AST_Interface **supports_flat, long n_supports_flat); - ~be_component (void); + ~be_component (); /// Override of the AST method to eliminate narrowing of /// the return value. Non-virtual. - be_component *base_component (void) const; + be_component *base_component () const; /// Catch BE-specific members before delegating to the base class. virtual void redefine (AST_Interface *from); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); @@ -53,14 +53,14 @@ public: AST_Structure *be_add_structure (AST_Structure *t); AST_Typedef *be_add_typedef (AST_Typedef *t); - ACE_CDR::ULong n_provides (void) const; - ACE_CDR::ULong n_remote_provides (void) const; - ACE_CDR::ULong n_uses (void) const; - ACE_CDR::ULong n_remote_uses (void) const; - bool has_uses_multiple (void) const; - ACE_CDR::ULong n_publishes (void) const; - ACE_CDR::ULong n_consumes (void) const; - ACE_CDR::ULong n_emits (void) const; + ACE_CDR::ULong n_provides () const; + ACE_CDR::ULong n_remote_provides () const; + ACE_CDR::ULong n_uses () const; + ACE_CDR::ULong n_remote_uses () const; + bool has_uses_multiple () const; + ACE_CDR::ULong n_publishes () const; + ACE_CDR::ULong n_consumes () const; + ACE_CDR::ULong n_emits () const; /// Update the has_* members. void scan (UTL_Scope *s); diff --git a/TAO/TAO_IDL/be_include/be_component_fwd.h b/TAO/TAO_IDL/be_include/be_component_fwd.h index 7ba68aee0ae..01ef8cc5c6c 100644 --- a/TAO/TAO_IDL/be_include/be_component_fwd.h +++ b/TAO/TAO_IDL/be_include/be_component_fwd.h @@ -29,10 +29,10 @@ public: be_component_fwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~be_component_fwd (void); + virtual ~be_component_fwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_connector.h b/TAO/TAO_IDL/be_include/be_connector.h index 00d945e6708..da35bc73d82 100644 --- a/TAO/TAO_IDL/be_include/be_connector.h +++ b/TAO/TAO_IDL/be_include/be_connector.h @@ -13,19 +13,19 @@ public: be_connector (UTL_ScopedName *n, AST_Connector *base_connector); - virtual ~be_connector (void); + virtual ~be_connector (); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); - bool dds_connector (void); - bool ami_connector (void); + bool dds_connector (); + bool ami_connector (); private: - void check_ancestors (void); + void check_ancestors (); private: bool dds_connector_; diff --git a/TAO/TAO_IDL/be_include/be_constant.h b/TAO/TAO_IDL/be_include/be_constant.h index 6b460d8289e..27f307b3813 100644 --- a/TAO/TAO_IDL/be_include/be_constant.h +++ b/TAO/TAO_IDL/be_include/be_constant.h @@ -32,7 +32,7 @@ public: virtual int accept (be_visitor *visitor); //Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_consumes.h b/TAO/TAO_IDL/be_include/be_consumes.h index a71dd3ea407..941d0381a08 100644 --- a/TAO/TAO_IDL/be_include/be_consumes.h +++ b/TAO/TAO_IDL/be_include/be_consumes.h @@ -16,16 +16,16 @@ public: be_consumes (UTL_ScopedName *n, AST_Type *consumes_type); - virtual ~be_consumes (void); + virtual ~be_consumes (); // Non-virtual override of frontend method. - be_eventtype *consumes_type (void) const; + be_eventtype *consumes_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // BE_CONSUMES_H diff --git a/TAO/TAO_IDL/be_include/be_decl.h b/TAO/TAO_IDL/be_include/be_decl.h index abf5b388052..1ae61b79451 100644 --- a/TAO/TAO_IDL/be_include/be_decl.h +++ b/TAO/TAO_IDL/be_include/be_decl.h @@ -34,7 +34,7 @@ public: be_decl (AST_Decl::NodeType type, UTL_ScopedName *n); - ~be_decl (void); + ~be_decl (); // Methods used by the interface type strategy. /// Both the arguments should be non-null!!!. Applies prefix and @@ -52,63 +52,63 @@ public: // End of Methods use by the interface type strategy. /// Return the scope created by this node (if one exists). - virtual be_scope *scope (void); + virtual be_scope *scope (); // Visiting virtual int accept (be_visitor *visitor); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); /// Temporarily set this node's is_local_ flag. void set_local (bool val); // Boolean methods to test if code was already generated. - bool cli_hdr_gen (void); - bool cli_stub_gen (void); - bool cli_inline_gen (void); - bool srv_hdr_gen (void); - bool impl_hdr_gen (void); - bool srv_skel_gen (void); - bool impl_skel_gen (void); - bool srv_inline_gen (void); - bool tie_skel_gen (void); - bool cli_hdr_any_op_gen (void); - bool cli_stub_any_op_gen (void); - bool cli_hdr_cdr_op_gen (void); - bool cli_stub_cdr_op_gen (void); - bool cli_inline_cdr_op_gen (void); - bool cli_inline_cdr_decl_gen (void); - bool cli_traits_gen (void); - bool cli_arg_traits_gen (void); - bool srv_arg_traits_gen (void); - bool srv_sarg_traits_gen (void); - bool cli_pragma_inst_gen (void); - bool cli_inarg_tmpl_class_gen (void); - bool cli_inarg_pragma_inst_gen (void); - bool cli_inoutarg_tmpl_class_gen (void); - bool cli_inoutarg_pragma_inst_gen (void); - bool cli_outarg_tmpl_class_gen (void); - bool cli_outarg_pragma_inst_gen (void); - bool cli_retarg_tmpl_class_gen (void); - bool cli_retarg_pragma_inst_gen (void); - bool srv_tmpl_class_gen (void); - bool srv_pragma_inst_gen (void); - bool srv_inarg_tmpl_class_gen (void); - bool srv_inarg_pragma_inst_gen (void); - bool srv_inoutarg_tmpl_class_gen (void); - bool srv_inoutarg_pragma_inst_gen (void); - bool srv_outarg_tmpl_class_gen (void); - bool srv_outarg_pragma_inst_gen (void); - bool srv_retarg_tmpl_class_gen (void); - bool srv_retarg_pragma_inst_gen (void); - bool ccm_pre_proc_gen (void); - bool ex_idl_facet_gen (void); - bool svnt_hdr_facet_gen (void); - bool svnt_src_facet_gen (void); - bool exec_hdr_facet_gen (void); - bool exec_src_facet_gen (void); - bool ami4ccm_ex_idl_gen (void); + bool cli_hdr_gen (); + bool cli_stub_gen (); + bool cli_inline_gen (); + bool srv_hdr_gen (); + bool impl_hdr_gen (); + bool srv_skel_gen (); + bool impl_skel_gen (); + bool srv_inline_gen (); + bool tie_skel_gen (); + bool cli_hdr_any_op_gen (); + bool cli_stub_any_op_gen (); + bool cli_hdr_cdr_op_gen (); + bool cli_stub_cdr_op_gen (); + bool cli_inline_cdr_op_gen (); + bool cli_inline_cdr_decl_gen (); + bool cli_traits_gen (); + bool cli_arg_traits_gen (); + bool srv_arg_traits_gen (); + bool srv_sarg_traits_gen (); + bool cli_pragma_inst_gen (); + bool cli_inarg_tmpl_class_gen (); + bool cli_inarg_pragma_inst_gen (); + bool cli_inoutarg_tmpl_class_gen (); + bool cli_inoutarg_pragma_inst_gen (); + bool cli_outarg_tmpl_class_gen (); + bool cli_outarg_pragma_inst_gen (); + bool cli_retarg_tmpl_class_gen (); + bool cli_retarg_pragma_inst_gen (); + bool srv_tmpl_class_gen (); + bool srv_pragma_inst_gen (); + bool srv_inarg_tmpl_class_gen (); + bool srv_inarg_pragma_inst_gen (); + bool srv_inoutarg_tmpl_class_gen (); + bool srv_inoutarg_pragma_inst_gen (); + bool srv_outarg_tmpl_class_gen (); + bool srv_outarg_pragma_inst_gen (); + bool srv_retarg_tmpl_class_gen (); + bool srv_retarg_pragma_inst_gen (); + bool ccm_pre_proc_gen (); + bool ex_idl_facet_gen (); + bool svnt_hdr_facet_gen (); + bool svnt_src_facet_gen (); + bool exec_hdr_facet_gen (); + bool exec_src_facet_gen (); + bool ami4ccm_ex_idl_gen (); // Set the flag indicating that code generation is done. void cli_hdr_gen (bool); diff --git a/TAO/TAO_IDL/be_include/be_emits.h b/TAO/TAO_IDL/be_include/be_emits.h index 2faf72315b8..813b0aa303a 100644 --- a/TAO/TAO_IDL/be_include/be_emits.h +++ b/TAO/TAO_IDL/be_include/be_emits.h @@ -16,16 +16,16 @@ public: be_emits (UTL_ScopedName *n, AST_Type *emits_type); - virtual ~be_emits (void); + virtual ~be_emits (); // Non-virtual override of frontend method. - be_eventtype *emits_type (void) const; + be_eventtype *emits_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // BE_EMITS_H diff --git a/TAO/TAO_IDL/be_include/be_enum.h b/TAO/TAO_IDL/be_include/be_enum.h index 0631f7d88d5..5154d85f2a1 100644 --- a/TAO/TAO_IDL/be_include/be_enum.h +++ b/TAO/TAO_IDL/be_include/be_enum.h @@ -35,7 +35,7 @@ public: bool use_underscore); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_enum_val.h b/TAO/TAO_IDL/be_include/be_enum_val.h index 82c194333a1..78959570fea 100644 --- a/TAO/TAO_IDL/be_include/be_enum_val.h +++ b/TAO/TAO_IDL/be_include/be_enum_val.h @@ -31,7 +31,7 @@ public: virtual int accept (be_visitor *visitor); //Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_eventtype.h b/TAO/TAO_IDL/be_include/be_eventtype.h index a8817c1ee3b..7b5e5fcfc39 100644 --- a/TAO/TAO_IDL/be_include/be_eventtype.h +++ b/TAO/TAO_IDL/be_include/be_eventtype.h @@ -37,13 +37,13 @@ public: bool truncatable, bool custom); - ~be_eventtype (void); + ~be_eventtype (); // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h index f56dd68a3f9..3ee3c770bc1 100644 --- a/TAO/TAO_IDL/be_include/be_eventtype_fwd.h +++ b/TAO/TAO_IDL/be_include/be_eventtype_fwd.h @@ -29,13 +29,13 @@ public: be_eventtype_fwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~be_eventtype_fwd (void); + virtual ~be_eventtype_fwd (); // Visiting. virtual int accept (be_visitor* visitor); // Cleanup - virtual void destroy (void); + virtual void destroy (); }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_exception.h b/TAO/TAO_IDL/be_include/be_exception.h index 47a829b15ee..39d42cea0d7 100644 --- a/TAO/TAO_IDL/be_include/be_exception.h +++ b/TAO/TAO_IDL/be_include/be_exception.h @@ -16,7 +16,7 @@ public: bool abstract); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_extended_port.h b/TAO/TAO_IDL/be_include/be_extended_port.h index bb918ad5855..992549a47ae 100644 --- a/TAO/TAO_IDL/be_include/be_extended_port.h +++ b/TAO/TAO_IDL/be_include/be_extended_port.h @@ -32,11 +32,11 @@ public: UTL_ScopedName *n, AST_PortType *porttype_ref); - virtual ~be_extended_port (void); + virtual ~be_extended_port (); - be_porttype *port_type (void) const; + be_porttype *port_type () const; - virtual void destroy (void); + virtual void destroy (); virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_extern.h b/TAO/TAO_IDL/be_include/be_extern.h index b6bb946bb8e..444fb4674ce 100644 --- a/TAO/TAO_IDL/be_include/be_extern.h +++ b/TAO/TAO_IDL/be_include/be_extern.h @@ -73,9 +73,9 @@ extern TAO_IDL_BE_Export BE_GlobalData *be_global; extern TAO_IDL_BE_Export int BE_init (int &, ACE_TCHAR*[]); extern TAO_IDL_BE_Export void BE_post_init (char *[], long); -extern TAO_IDL_BE_Export void BE_version (void); -extern TAO_IDL_BE_Export void BE_produce (void); -extern TAO_IDL_BE_Export void BE_cleanup (void); -extern TAO_IDL_BE_Export void BE_abort (void); +extern TAO_IDL_BE_Export void BE_version (); +extern TAO_IDL_BE_Export void BE_produce (); +extern TAO_IDL_BE_Export void BE_cleanup (); +extern TAO_IDL_BE_Export void BE_abort (); #endif // _BE_EXTERN_BE_EXTERN_HH diff --git a/TAO/TAO_IDL/be_include/be_factory.h b/TAO/TAO_IDL/be_include/be_factory.h index fcea3e23ecc..5b9c3b4ac58 100644 --- a/TAO/TAO_IDL/be_include/be_factory.h +++ b/TAO/TAO_IDL/be_include/be_factory.h @@ -30,10 +30,10 @@ class be_factory : public virtual AST_Factory, public: be_factory (UTL_ScopedName *n); - ~be_factory (void); + ~be_factory (); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_field.h b/TAO/TAO_IDL/be_include/be_field.h index 523c5db704a..0f61138f6d0 100644 --- a/TAO/TAO_IDL/be_include/be_field.h +++ b/TAO/TAO_IDL/be_include/be_field.h @@ -29,7 +29,7 @@ public: Visibility vis = vis_NA); // Non-virtual override of frontend method. - be_type *field_type (void) const; + be_type *field_type () const; // Generate debugging ostream operator for members. void gen_member_ostream_operator (TAO_OutStream *os, @@ -38,14 +38,14 @@ public: bool accessor = false); // Accessors for the member. - bool port_name_prefixed (void) const; + bool port_name_prefixed () const; void port_name_prefixed (bool val); // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // If the name of a provides or uses node has already been diff --git a/TAO/TAO_IDL/be_include/be_finder.h b/TAO/TAO_IDL/be_include/be_finder.h index 65fc54c8a44..d6f7208aec6 100644 --- a/TAO/TAO_IDL/be_include/be_finder.h +++ b/TAO/TAO_IDL/be_include/be_finder.h @@ -24,10 +24,10 @@ class be_finder : public virtual AST_Finder, public: be_finder (UTL_ScopedName *n); - ~be_finder (void); + ~be_finder (); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_global.h b/TAO/TAO_IDL/be_include/be_global.h index 5a7a97ad9b9..01dfa862b74 100644 --- a/TAO/TAO_IDL/be_include/be_global.h +++ b/TAO/TAO_IDL/be_include/be_global.h @@ -55,14 +55,14 @@ public: COREDX }; - BE_GlobalData (void); - ~BE_GlobalData (void); + BE_GlobalData (); + ~BE_GlobalData (); // To switch between changing or non-changing standard include // files (e.g. tao/corba.h) so that #include statements can be // generated with ""s or <>s respectively. void changing_standard_include_files (size_t changing); - size_t changing_standard_include_files (void); + size_t changing_standard_include_files (); // Helper functions that generate the file names for the C++ mapping // generated code. @@ -72,7 +72,7 @@ public: static const char *be_get_client_hdr_fname ( bool base_name_only = false); - static const char *be_get_client_stub_fname (void); + static const char *be_get_client_stub_fname (); static const char *be_get_client_inline_fname ( bool base_name_only = false); @@ -89,9 +89,9 @@ public: static const char *be_get_server_template_hdr_fname ( bool base_name_only = false); - static const char *be_get_server_skeleton_fname (void); + static const char *be_get_server_skeleton_fname (); - static const char *be_get_implementation_skeleton_fname (void); + static const char *be_get_implementation_skeleton_fname (); static const char *be_get_server_template_skeleton_fname ( bool base_name_only = false); @@ -250,14 +250,14 @@ public: /// Returns the macro name for exporting server side classes in Win32 /// DLL. - const char* skel_export_macro (void) const; + const char* skel_export_macro () const; /// Set the macro name for export server side classes in Win32 DLL. void skel_export_macro (const char* s); /// Returns the name of the include file that contains the server /// side export macro definition. - const char* skel_export_include (void) const; + const char* skel_export_include () const; /// Set the name of the include file that contains the server side /// export macro definition. @@ -265,7 +265,7 @@ public: /// Returns the name of the include file that will be generated for the /// server side export macro definition. - const char* skel_export_file (void) const; + const char* skel_export_file () const; /// Set the name of the include file that the will be generated for server /// side export macro definition. @@ -273,14 +273,14 @@ public: /// Returns the macro name for exporting client side classes in Win32 /// DLL. - const char* stub_export_macro (void) const; + const char* stub_export_macro () const; /// Set the macro name for export client side classes in Win32 DLL. void stub_export_macro (const char* s); /// Returns the name of the include file that contains the client /// side export macro definition. - const char* stub_export_include (void) const; + const char* stub_export_include () const; /// Set the name of the include file that contains the client side /// export macro definition. @@ -288,7 +288,7 @@ public: /// Returns the name of the include file will be generated for the client /// side export macro definition. - const char* stub_export_file (void) const; + const char* stub_export_file () const; /// Set the name of the include file that will be generated for the client /// side export macro definition. @@ -296,14 +296,14 @@ public: /// Returns the macro name for exporting *A.h file classes in Win32 /// DLL. - const char* anyop_export_macro (void) const; + const char* anyop_export_macro () const; /// Set the macro name for export *A.h file classes in Win32 DLL. void anyop_export_macro (const char* s); /// Returns the name of the include file that contains the *A.h /// file export macro definition. - const char* anyop_export_include (void) const; + const char* anyop_export_include () const; /// Set the name of the include file that contains the *A.h file /// export macro definition. @@ -311,14 +311,14 @@ public: /// Returns the macro name for exporting exec impl classes in Win32 /// DLL. - const char* exec_export_macro (void) const; + const char* exec_export_macro () const; /// Set the macro name for export exec impl classes in Win32 DLL. void exec_export_macro (const char* s); /// Returns the name of the include file that contains the exec /// impl export macro definition. - const char* exec_export_include (void) const; + const char* exec_export_include () const; /// Set the name of the include file that contains the exec impl /// export macro definition. @@ -326,14 +326,14 @@ public: /// Returns the macro name for exporting CIAO svnt classes in Win32 /// DLL. - const char* svnt_export_macro (void) const; + const char* svnt_export_macro () const; /// Set the macro name for export CIAO svnt classes in Win32 DLL. void svnt_export_macro (const char* s); /// Returns the name of the include file that contains the CIAO /// svnt export macro definition. - const char* svnt_export_include (void) const; + const char* svnt_export_include () const; /// Set the name of the include file that contains the CIAO svnt /// export macro definition. @@ -341,7 +341,7 @@ public: /// Returns the macro name for exporting CIAO connector /// classes in Win32 DLL. - const char* conn_export_macro (void) const; + const char* conn_export_macro () const; /// Set the macro name for export CIAO connector /// classes in Win32 DLL. @@ -349,7 +349,7 @@ public: /// Returns the name of the include file that contains the CIAO /// connector export macro definition. - const char* conn_export_include (void) const; + const char* conn_export_include () const; /// Set the name of the include file that contains the CIAO /// connector export macro definition. @@ -357,7 +357,7 @@ public: /// Returns the name of the include file to be used for precompiled /// header support. - const char* pch_include (void) const; + const char* pch_include () const; /// Set the name of the include file to be used for precompiled /// header support. @@ -365,7 +365,7 @@ public: /// Returns the name of the include file to be put at the top of /// every header file. - const char* pre_include (void) const; + const char* pre_include () const; /// Set the name of the include file to be put at the top of every /// header file. @@ -373,21 +373,21 @@ public: /// Returns the name of the include file to be put at the bottom of /// every header file. - const char* post_include (void) const; + const char* post_include () const; /// Set the name of the include file to be put at the bottom of every /// header file. void post_include (const char* s); /// Returns the guard that is placed in the client header file - const char* include_guard (void) const; + const char* include_guard () const; /// Set the guard that is placed in the client header file void include_guard (const char* s); /// Returns the name of the include file that is used instead of the own /// generated client header file - const char* safe_include (void) const; + const char* safe_include () const; /// set the name of the include file that is used instead of the own /// generated client header file @@ -395,7 +395,7 @@ public: /// Returns the name of the include file that should on get /// generated in the client header file - const char* unique_include (void) const; + const char* unique_include () const; /// Set the name of the include file that should on get /// generated in the client header file @@ -403,7 +403,7 @@ public: /// Returns the name of the include file that should be used as /// stripped_filename - const char* stripped_filename (void) const; + const char* stripped_filename () const; /// Set the name of the include file that should be used as stripped_filename void stripped_filename (const char* s); @@ -412,27 +412,27 @@ public: void versioning_begin (const char* s); /// Get text that opens a "versioned" namespace. - const char * versioning_begin (void) const; + const char * versioning_begin () const; /// Set include file for "versioned" namespace. void versioning_include (const char* s); /// Get include file for "versioned" namespace. - const char * versioning_include (void) const; + const char * versioning_include () const; /// Get text that opens a "versioned" namespace for core TAO/orbsvcs /// related code. - const char * core_versioning_begin (void) const; + const char * core_versioning_begin () const; /// Set text that closes a "versioned" namespace. void versioning_end (const char* s); /// Get text that closes a "versioned" namespace. - const char * versioning_end (void) const; + const char * versioning_end () const; /// Get text that closes a "versioned" namespace for core TAO/orbsvcs /// related code. - const char * core_versioning_end (void) const; + const char * core_versioning_end () const; // = Set and get methods for different file name endings. @@ -440,25 +440,25 @@ public: void client_hdr_ending (const char* s); /// Get the client_hdr_ending. - const char* client_hdr_ending (void) const; + const char* client_hdr_ending () const; /// Set the client_inline_ending. void client_inline_ending (const char* s); /// Get the client_inline_ending. - const char* client_inline_ending (void) const; + const char* client_inline_ending () const; /// Set the client_stub_ending. void client_stub_ending (const char* s); /// Get the client_stub_ending. - const char* client_stub_ending (void) const; + const char* client_stub_ending () const; /// Set the server_hdr_ending. void server_hdr_ending (const char* s); /// Get the server_hdr_ending. - const char* server_hdr_ending (void) const; + const char* server_hdr_ending () const; /// Set the implementation_hdr_ending. void implementation_hdr_ending (const char* s); @@ -473,121 +473,121 @@ public: void implementation_skel_ending (const char* s); /// Get the implementation_hdr_ending. - const char* implementation_hdr_ending (void) const; + const char* implementation_hdr_ending () const; ///Get implementation class prefix - const char* impl_class_prefix (void) const; + const char* impl_class_prefix () const; ///Get implementation class suffix - const char* impl_class_suffix (void) const; + const char* impl_class_suffix () const; /// Get the implementation_skel_ending. - const char* implementation_skel_ending (void) const; + const char* implementation_skel_ending () const; /// Set the server_template_hdr_ending. void server_template_hdr_ending (const char* s); /// Get the server_template_hdr_ending. - const char* server_template_hdr_ending (void) const; + const char* server_template_hdr_ending () const; /// Set the server_skeleton_ending. void server_skeleton_ending (const char* s); /// Get the server_skeleton_ending. - const char* server_skeleton_ending (void) const; + const char* server_skeleton_ending () const; /// Set the server_template_skeleton_ending. void server_template_skeleton_ending (const char* s); /// Get the server_template_skeleton_ending. - const char* server_template_skeleton_ending (void) const; + const char* server_template_skeleton_ending () const; /// Set the anyop_header_ending. void anyop_header_ending (const char* s); /// Get the anyop_header_ending. - const char* anyop_header_ending (void) const; + const char* anyop_header_ending () const; /// Set the anyop_source_ending. void anyop_source_ending (const char* s); /// Get the anyop_source_ending. - const char* anyop_source_ending (void) const; + const char* anyop_source_ending () const; /// Similar to above, but for CIAO servant and executor /// impl and executor IDL files, if generated. void ciao_svnt_header_template_ending (const char* s); - const char* ciao_svnt_header_template_ending (void) const; + const char* ciao_svnt_header_template_ending () const; void ciao_svnt_source_template_ending (const char* s); - const char* ciao_svnt_source_template_ending (void) const; + const char* ciao_svnt_source_template_ending () const; void ciao_svnt_header_ending (const char* s); - const char* ciao_svnt_header_ending (void) const; + const char* ciao_svnt_header_ending () const; void ciao_svnt_source_ending (const char* s); - const char* ciao_svnt_source_ending (void) const; + const char* ciao_svnt_source_ending () const; void ciao_exec_header_ending (const char* s); - const char* ciao_exec_header_ending (void) const; + const char* ciao_exec_header_ending () const; void ciao_exec_source_ending (const char* s); - const char* ciao_exec_source_ending (void) const; + const char* ciao_exec_source_ending () const; void ciao_exec_stub_header_ending (const char* s); - const char* ciao_exec_stub_header_ending (void) const; + const char* ciao_exec_stub_header_ending () const; void ciao_exec_idl_ending (const char* s); - const char* ciao_exec_idl_ending (void) const; + const char* ciao_exec_idl_ending () const; void ciao_conn_header_ending (const char* s); - const char* ciao_conn_header_ending (void) const; + const char* ciao_conn_header_ending () const; void ciao_conn_source_ending (const char* s); - const char* ciao_conn_source_ending (void) const; + const char* ciao_conn_source_ending () const; /// For generating TypeSupport header file includes. void dds_typesupport_hdr_ending (const char* s); - const char* dds_typesupport_hdr_ending (void) const; + const char* dds_typesupport_hdr_ending () const; /// For optionally generating CIAO AMI connector IDL file. void ciao_ami_conn_idl_ending (const char* s); - const char* ciao_ami_conn_idl_ending (void) const; + const char* ciao_ami_conn_idl_ending () const; /// For optionally generating CIAO AMI reply handler /// impl header file. void ciao_ami_conn_impl_hdr_ending (const char* s); - const char* ciao_ami_conn_impl_hdr_ending (void) const; + const char* ciao_ami_conn_impl_hdr_ending () const; /// For optionally generating CIAO AMI reply handler /// impl source file. void ciao_ami_conn_impl_src_ending (const char* s); - const char* ciao_ami_conn_impl_src_ending (void) const; + const char* ciao_ami_conn_impl_src_ending () const; /// For optionally controlling the container type, default is Session void ciao_container_type (const char* s); - const char* ciao_container_type (void) const; + const char* ciao_container_type () const; /// Set the clonable_in_args. void use_clonable_in_args (bool clonable); /// Get the clonable_in_args setting. - bool use_clonable_in_args (void) const; + bool use_clonable_in_args () const; /// Get the gen_seq_template_export_ member. - bool gen_template_export (void) const; + bool gen_template_export () const; /// Set the gen_seq_template_export_ member. void gen_template_export (bool val); /// Get the gen_ostream_operators_ member. - bool gen_ostream_operators (void) const; + bool gen_ostream_operators () const; /// Set the gen_ostream_operators_ member. void gen_ostream_operators (bool val); /// Get the gen_static_desc_operations_ member. - bool gen_static_desc_operations (void) const; + bool gen_static_desc_operations () const; /// Set the gen_static_desc_operations_ member. void gen_static_desc_operations (bool val); @@ -605,7 +605,7 @@ public: * to be kept. Default is current directory from which the * <tao_idl> is called. */ - const char* output_dir (void) const; + const char* output_dir () const; /// Set the path for all *C.* file includes. /// Default is local directory or $TAO_ROOT/tao. @@ -613,7 +613,7 @@ public: /// Get the path for all *C.* file includes. /// Default is local directory or $TAO_ROOT/tao. - const char* stub_include_dir (void) const; + const char* stub_include_dir () const; /// Set the directory where all the *S.* files are /// to be kept. Default is output_dir_. @@ -621,7 +621,7 @@ public: /// Get the directory where all the *S.* files are /// to be kept. Default is output_dir_. - const char* skel_output_dir (void) const; + const char* skel_output_dir () const; /// Set the directory where all the *A.* files are /// to be kept. Default is output_dir_. @@ -629,7 +629,7 @@ public: /// Get the directory where all the *A.* files are /// to be kept. Default is output_dir_. - const char* anyop_output_dir (void) const; + const char* anyop_output_dir () const; /// Set the directory where all the *exec.* files are /// to be kept. Default is output_dir_. @@ -637,10 +637,10 @@ public: /// Get the directory where all the *exec.* files are /// to be kept. Default is output_dir_. - const char* exec_output_dir (void) const; + const char* exec_output_dir () const; ///Get the flag for not overwriting already existing exec files. - bool overwrite_not_exec (void) const; + bool overwrite_not_exec () const; ///Set the flag for not overwriting already existing exec files. void overwrite_not_exec (bool val); @@ -649,138 +649,138 @@ public: void any_support (bool); /// Check Any support. - bool any_support (void) const; + bool any_support () const; /// Set cdr support. void cdr_support (bool); /// Check cdr support. - bool cdr_support (void) const; + bool cdr_support () const; /// Set TypeCode support. void tc_support (bool); /// Check TypeCode support - bool tc_support (void) const; + bool tc_support () const; /// Set optimized valuetype member accessor generation. void obv_opt_accessor (bool); /// Check optimized valuetype member accessor generation. - bool obv_opt_accessor (void) const; + bool obv_opt_accessor () const; /// Set generation of implementation files. void gen_impl_files (bool); /// Check if we want to generate implementation files. - bool gen_impl_files (void) const; + bool gen_impl_files () const; /// Set generation of source file and line number for implementation files. void gen_impl_debug_info (bool); /// Check generation of source file and line number implementation files. - bool gen_impl_debug_info (void) const; + bool gen_impl_debug_info () const; /// Set generation of copy constructor. void gen_copy_ctor (bool); /// Check if we want to generate the copy constructor. - bool gen_copy_ctor (void) const; + bool gen_copy_ctor () const; /// Set the generation of the assignment operator. void gen_assign_op (bool); /// Check if we want to generate the assignment operator. - bool gen_assign_op (void) const; + bool gen_assign_op () const; /// Set whether we want to generate Thru_POA collocation stubs. void gen_thru_poa_collocation (bool); /// Check if we want to generate Thru_POA collocation stubs. - bool gen_thru_poa_collocation (void) const; + bool gen_thru_poa_collocation () const; /// Set whether we want to generate Direct collocation stubs. void gen_direct_collocation (bool); /// Check if we want to generate Direct collocation stubs. - bool gen_direct_collocation (void) const; + bool gen_direct_collocation () const; /// Set whether we want to generate for CORBA/e void gen_corba_e (bool); /// Check if we want to generate for CORBA/e - bool gen_corba_e (void) const; + bool gen_corba_e () const; /// Set whether we want to generate for Minimum CORBA void gen_minimum_corba (bool); /// Check if we want to generate for Minimum CORBA - bool gen_minimum_corba (void) const; + bool gen_minimum_corba () const; /// Set whether we want to generate for noeventCCM void gen_noeventccm (bool); /// Check if we want to generate for noeventCCM - bool gen_noeventccm (void) const; + bool gen_noeventccm () const; /// Set whether we want to generate for LwCCM void gen_lwccm (bool); /// Check if we want to generate for LwCCM - bool gen_lwccm (void) const; + bool gen_lwccm () const; /// Set optimized typecodes. void opt_tc (bool); /// Check if TypeCodes are optimized. - bool opt_tc (void) const; + bool opt_tc () const; /// To enable or disable AMI4CCM call back feature void ami4ccm_call_back (bool value); /// Return the flag. - bool ami4ccm_call_back (void) const; + bool ami4ccm_call_back () const; /// To enable or disable AMI call back feature of the Messaging /// specification in the generated code. void ami_call_back (bool value); /// Return the flag. - bool ami_call_back (void) const; + bool ami_call_back () const; /// To enable or disable AMH in the generated code. void gen_amh_classes (bool value); /// Return the flag. - bool gen_amh_classes (void) const; + bool gen_amh_classes () const; /// Set the generation of tie classes and files. void gen_tie_classes (bool value); /// Return the flag. - bool gen_tie_classes (void) const; + bool gen_tie_classes () const; /// To enable or disable AMI call back feature of the Messaging /// specification in the generated code. void gen_smart_proxies (bool value); /// Return the flag. - bool gen_smart_proxies (void) const; + bool gen_smart_proxies () const; /// Set the flag. void gen_inline_constants (bool value); /// Return the flag. - bool gen_inline_constants (void) const; + bool gen_inline_constants () const; /// Set the flag. void gen_orb_h_include (bool value); /// Return the flag. - bool gen_orb_h_include (void) const; + bool gen_orb_h_include () const; /// Generate an empty anyop header (A.h) - bool gen_empty_anyop_header (void) const; + bool gen_empty_anyop_header () const; /// Generate an empty anyop header (A.h) void gen_empty_anyop_header (bool value); @@ -790,144 +790,144 @@ public: /// Return the enumerated value for the lookup strategy. Default is /// perfect hashing. - LOOKUP_STRATEGY lookup_strategy (void) const; + LOOKUP_STRATEGY lookup_strategy () const; /// Set the DDS implementation. void dds_impl (char const * const val); /// Return the enumerated value for the DDS implementation. /// Default is NDDS. - DDS_IMPL dds_impl (void) const; + DDS_IMPL dds_impl () const; /// Cleanup function. - void destroy (void); + void destroy (); /// Used in the generation of extern function declarations so we /// can use non-defined interfaces as members and parameters. ACE_Unbounded_Queue<be_interface_fwd *> non_defined_interfaces; /// Accessor for the member, sets it on the first call. - AST_PredefinedType *void_type (void); + AST_PredefinedType *void_type (); /// Accessor for the member, sets it on the first call. - be_interface *ccmobject (void); + be_interface *ccmobject (); /// Accessor for the member, sets it on the first call. - be_module *messaging (void); + be_module *messaging (); /// Accessor for the member, sets it on the first call. - be_valuetype *messaging_exceptionholder (void); + be_valuetype *messaging_exceptionholder (); /// Accessor for the member, sets it on the first call. - be_interface *messaging_replyhandler (void); + be_interface *messaging_replyhandler (); /// Accessors for the member. - bool gen_anyop_files (void) const; + bool gen_anyop_files () const; void gen_anyop_files (bool val); /// Accessors for the member gen_skel_files_. - bool gen_skel_files (void) const; + bool gen_skel_files () const; void gen_skel_files (bool val); /// Accessors for the member gen_svnt_cpp_files_. - bool gen_svnt_cpp_files (void) const; + bool gen_svnt_cpp_files () const; void gen_svnt_cpp_files (bool val); /// Accessors for the member gen_svnt_t_files_. - bool gen_svnt_t_files (void) const; + bool gen_svnt_t_files () const; void gen_svnt_t_files (bool val); /// Accessors for the member gen_client_inline_. - bool gen_client_inline (void) const; + bool gen_client_inline () const; void gen_client_inline (bool val); /// Accessors for the member gen_client_stub_. - bool gen_client_stub (void) const; + bool gen_client_stub () const; void gen_client_stub (bool val); /// Accessors for the member gen_client_header_. - bool gen_client_header (void) const; + bool gen_client_header () const; void gen_client_header (bool val); /// Accessors for the member gen_server_skeleton_. - bool gen_server_skeleton (void) const; + bool gen_server_skeleton () const; void gen_server_skeleton (bool val); /// Accessors for the member gen_server_header_. - bool gen_server_header (void) const; + bool gen_server_header () const; void gen_server_header (bool val); /// Accessors for the member gen_local_iface_anyops_. - bool gen_local_iface_anyops (void) const; + bool gen_local_iface_anyops () const; void gen_local_iface_anyops (bool val); /// Accessors for the member gen_custom_ending_. - bool gen_custom_ending (void) const; + bool gen_custom_ending () const; void gen_custom_ending (bool val); /// Accessors for the member gen_unique_guards_. - bool gen_unique_guards (void) const; + bool gen_unique_guards () const; void gen_unique_guards (bool val); /// Accessors for the corresponding members. - bool gen_ciao_svnt (void) const; + bool gen_ciao_svnt () const; void gen_ciao_svnt (bool val); - bool gen_ciao_exec_idl (void) const; + bool gen_ciao_exec_idl () const; void gen_ciao_exec_idl (bool val); - bool gen_ciao_exec_impl (void) const; + bool gen_ciao_exec_impl () const; void gen_ciao_exec_impl (bool val); - bool gen_ciao_exec_reactor_impl (void) const; + bool gen_ciao_exec_reactor_impl () const; void gen_ciao_exec_reactor_impl (bool val); - bool gen_ciao_conn_impl (void) const; + bool gen_ciao_conn_impl () const; void gen_ciao_conn_impl (bool val); - bool gen_dds_typesupport_idl (void) const; + bool gen_dds_typesupport_idl () const; void gen_dds_typesupport_idl (bool val); - bool gen_ciao_valuefactory_reg (void) const; + bool gen_ciao_valuefactory_reg () const; void gen_ciao_valuefactory_reg (bool val); - bool gen_stub_export_hdr_file (void) const; + bool gen_stub_export_hdr_file () const; void gen_stub_export_hdr_file (bool val); - bool gen_skel_export_hdr_file (void) const; + bool gen_skel_export_hdr_file () const; void gen_skel_export_hdr_file (bool val); - bool gen_svnt_export_hdr_file (void) const; + bool gen_svnt_export_hdr_file () const; void gen_svnt_export_hdr_file (bool val); - bool gen_exec_export_hdr_file (void) const; + bool gen_exec_export_hdr_file () const; void gen_exec_export_hdr_file (bool val); - bool gen_conn_export_hdr_file (void) const; + bool gen_conn_export_hdr_file () const; void gen_conn_export_hdr_file (bool val); - bool alt_mapping (void) const; + bool alt_mapping () const; void alt_mapping (bool val); - bool in_facet_servant (void) const; + bool in_facet_servant () const; void in_facet_servant (bool val); - bool gen_arg_traits (void) const; + bool gen_arg_traits () const; void gen_arg_traits (bool val); - bool gen_anytypecode_adapter (void) const; + bool gen_anytypecode_adapter () const; void gen_anytypecode_adapter (bool val); bool no_fixed_err () const; void no_fixed_err (bool val); - unsigned long tab_size (void) const; + unsigned long tab_size () const; void tab_size (unsigned long val); /// Command line passed to ACE_Process::spawn. Different /// implementations in IDL and IFR backends. - ACE_CString spawn_options (void); + ACE_CString spawn_options (); /** * Parse an argument that the frontend did not recognize. diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index 3f6fef60936..1acdf87dbc5 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -28,12 +28,12 @@ class AST_Expression; // and use the current indentation for the succeeding line struct TAO_NL { - TAO_NL (void); + TAO_NL (); }; struct TAO_NL_2 { - TAO_NL_2 (void); + TAO_NL_2 (); }; /** @@ -123,9 +123,9 @@ public: CIAO_AMI_RH_IMPL_SRC }; - TAO_OutStream (void); + TAO_OutStream (); - virtual ~TAO_OutStream (void); + virtual ~TAO_OutStream (); /// Open the underlying low-level handle for output. int open (const char *fname, @@ -135,10 +135,10 @@ public: void stream_type (TAO_OutStream::STREAM_TYPE); /// Return the stream type - TAO_OutStream::STREAM_TYPE stream_type (void); + TAO_OutStream::STREAM_TYPE stream_type (); /// Return the underlying lowlevel file pointer. - FILE *&file (void); + FILE *&file (); /// Increment the indentation level and by default actually indent the output /// accordingly @@ -149,13 +149,13 @@ public: int decr_indent (unsigned short flag = 1); /// Reset indentation level to 0 - int reset (void); + int reset (); /// Indent starting next line - int indent (void); + int indent (); /// Put a newline and indent on the next line - int nl (void); + int nl (); /// "printf" style variable argument print int print (const char *format, ...) @@ -167,7 +167,7 @@ public: bool add_stream_type_suffix = true); /// Generate an endif statement - int gen_endif (void); + int gen_endif (); // =overloaded operators // Avoid duplication for the underlying type of size_t diff --git a/TAO/TAO_IDL/be_include/be_home.h b/TAO/TAO_IDL/be_include/be_home.h index 1161da68920..7f4156fdfe4 100644 --- a/TAO/TAO_IDL/be_include/be_home.h +++ b/TAO/TAO_IDL/be_include/be_home.h @@ -35,12 +35,12 @@ public: AST_Interface **supports_flat, long n_supports_flat); - virtual ~be_home (void); + virtual ~be_home (); void scan (UTL_Scope *s); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_interface.h b/TAO/TAO_IDL/be_include/be_interface.h index 999486b78dd..55b5bb39736 100644 --- a/TAO/TAO_IDL/be_include/be_interface.h +++ b/TAO/TAO_IDL/be_include/be_interface.h @@ -50,15 +50,15 @@ public: bool abstract); /// Destructor. - ~be_interface (void); + ~be_interface (); // Methods, which access the strategy. /// Return the local name. - const char *local_name (void); + const char *local_name (); /// Retrieve the fully scoped skel class name. - const char *full_skel_name (void); + const char *full_skel_name (); /// Retrieve the fully qualified collocated class name. const char *full_coll_name (int); @@ -67,21 +67,21 @@ public: const char *local_coll_name (int); /// retrieve the name of the direct proxy implementation. - virtual const char *direct_proxy_impl_name (void); + virtual const char *direct_proxy_impl_name (); /// retrieve the fully qualified name of the direct proxy /// implementation. - virtual const char *full_direct_proxy_impl_name (void); + virtual const char *full_direct_proxy_impl_name (); /// Return the client scope that encloses the interface. - virtual const char *client_enclosing_scope (void); + virtual const char *client_enclosing_scope (); /// Return the "flattened" scope that encloses /// the interface. - virtual const char *flat_client_enclosing_scope (void); + virtual const char *flat_client_enclosing_scope (); /// Return the server scope that encloses the interface. - virtual const char *server_enclosing_scope (void); + virtual const char *server_enclosing_scope (); /// Retrieve skeleton name. const char *relative_skel_name (const char *skel_name); @@ -107,7 +107,7 @@ public: /// Generate the declarations used by the template _var, _out /// classes for interfaces, and by sequence template classes. - void gen_var_out_seq_decls (void); + void gen_var_out_seq_decls (); // Each interface (to fix names "T") also defines two help classes, // the "collocated" class inherits from T, but delegates on the @@ -148,19 +148,19 @@ public: * 0 => no * 1 => yes */ - int in_mult_inheritance (void); + int in_mult_inheritance (); /// Set a new value. void in_mult_inheritance (int mi); /// Applies to interfaces, components, and homes. - bool has_rw_attributes (void) const; + bool has_rw_attributes () const; /// Pass along BE-specific member values when redefining a fwd decl. virtual void redefine (AST_Interface *from); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); @@ -237,10 +237,10 @@ public: /// Returns the original interface from which this one was created, /// applies only to implied IDL - be_interface *original_interface (void); + be_interface *original_interface (); /// Is EventConsumerBase our parent? - bool is_event_consumer (void); + bool is_event_consumer (); /** * Common code for facet generation, whether we are @@ -252,14 +252,14 @@ public: /// Used with ami4ccm. int gen_ami4ccm_idl (TAO_OutStream *os); - bool is_ami_rh (void) const; + bool is_ami_rh () const; void is_ami_rh (bool val); - bool is_ami4ccm_rh (void) const; + bool is_ami4ccm_rh () const; void is_ami4ccm_rh (bool val); /// Accessors for the member. - bool dds_connector_traits_done (void) const; + bool dds_connector_traits_done () const; void dds_connector_traits_done (bool val); /// Generate the "public virtual" entries in the stub header. @@ -427,7 +427,7 @@ public: /** * This is a no-op, simply put here to keep compilers happy. */ - virtual ~TAO_IDL_Inheritance_Hierarchy_Worker (void); + virtual ~TAO_IDL_Inheritance_Hierarchy_Worker (); /// Define the method invoked during the inheritance traversal /** diff --git a/TAO/TAO_IDL/be_include/be_interface_fwd.h b/TAO/TAO_IDL/be_include/be_interface_fwd.h index 683af1090b0..29271083e30 100644 --- a/TAO/TAO_IDL/be_include/be_interface_fwd.h +++ b/TAO/TAO_IDL/be_include/be_interface_fwd.h @@ -33,7 +33,7 @@ public: be_interface_fwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~be_interface_fwd (void); + virtual ~be_interface_fwd (); /// Mutator overrides for be_type members. If we have been /// defined, we want the full definition to be set as well. @@ -41,7 +41,7 @@ public: virtual void seen_in_operation (bool val); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_mirror_port.h b/TAO/TAO_IDL/be_include/be_mirror_port.h index 1fb3e445b58..aa2737c7e29 100644 --- a/TAO/TAO_IDL/be_include/be_mirror_port.h +++ b/TAO/TAO_IDL/be_include/be_mirror_port.h @@ -31,9 +31,9 @@ public: UTL_ScopedName *n, AST_PortType *porttype_ref); - virtual ~be_mirror_port (void); + virtual ~be_mirror_port (); - virtual void destroy (void); + virtual void destroy (); virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_module.h b/TAO/TAO_IDL/be_include/be_module.h index 620ffdb5e45..9fe8eb3118b 100644 --- a/TAO/TAO_IDL/be_include/be_module.h +++ b/TAO/TAO_IDL/be_include/be_module.h @@ -28,7 +28,7 @@ public: be_module (UTL_ScopedName *n, AST_Module *previous = 0); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_native.h b/TAO/TAO_IDL/be_include/be_native.h index 341e7eccb4a..1a39721737a 100644 --- a/TAO/TAO_IDL/be_include/be_native.h +++ b/TAO/TAO_IDL/be_include/be_native.h @@ -30,16 +30,16 @@ class be_native : public virtual AST_Native, public: be_native (UTL_ScopedName *n); - virtual ~be_native (void) {} + virtual ~be_native () {} /// Generate the typecode description. - virtual int gen_typecode (void); + virtual int gen_typecode (); /// Return typecode size. - virtual long tc_size (void); + virtual long tc_size (); /// Cleanup. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_null_return_emitter.h b/TAO/TAO_IDL/be_include/be_null_return_emitter.h index 9bfc930ea6f..56fd4e89cff 100644 --- a/TAO/TAO_IDL/be_include/be_null_return_emitter.h +++ b/TAO/TAO_IDL/be_include/be_null_return_emitter.h @@ -23,7 +23,7 @@ class be_null_return_emitter { public: be_null_return_emitter (be_visitor_context *ctx); - ~be_null_return_emitter (void); + ~be_null_return_emitter (); int emit (be_type *node); diff --git a/TAO/TAO_IDL/be_include/be_operation.h b/TAO/TAO_IDL/be_include/be_operation.h index 8e08f3350df..3ecd2965573 100644 --- a/TAO/TAO_IDL/be_include/be_operation.h +++ b/TAO/TAO_IDL/be_include/be_operation.h @@ -35,10 +35,10 @@ public: bool local, bool abstract); - ~be_operation (void); + ~be_operation (); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); @@ -49,13 +49,13 @@ public: /// Insert an exception at the head of the list. int be_insert_exception (AST_Exception *ex); - bool is_sendc_ami (void) const; + bool is_sendc_ami () const; void is_sendc_ami (bool val); - bool is_excep_ami (void) const; + bool is_excep_ami () const; void is_excep_ami (bool val); - bool is_attr_op (void) const; + bool is_attr_op () const; void is_attr_op (bool val); protected: diff --git a/TAO/TAO_IDL/be_include/be_param_holder.h b/TAO/TAO_IDL/be_include/be_param_holder.h index 64a39d8f9ff..2eecadb9e4a 100644 --- a/TAO/TAO_IDL/be_include/be_param_holder.h +++ b/TAO/TAO_IDL/be_include/be_param_holder.h @@ -26,10 +26,10 @@ public: be_param_holder (UTL_ScopedName *parameter_name, FE_Utils::T_Param_Info *info); - virtual ~be_param_holder (void); + virtual ~be_param_holder (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_porttype.h b/TAO/TAO_IDL/be_include/be_porttype.h index c6a9b607a04..4a0464e3083 100644 --- a/TAO/TAO_IDL/be_include/be_porttype.h +++ b/TAO/TAO_IDL/be_include/be_porttype.h @@ -31,9 +31,9 @@ class be_porttype : public virtual AST_PortType, public: be_porttype (UTL_ScopedName *n); - virtual ~be_porttype (void); + virtual ~be_porttype (); - virtual void destroy (void); + virtual void destroy (); virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_predefined_type.h b/TAO/TAO_IDL/be_include/be_predefined_type.h index 13dc307c4f5..026095fd4e6 100644 --- a/TAO/TAO_IDL/be_include/be_predefined_type.h +++ b/TAO/TAO_IDL/be_include/be_predefined_type.h @@ -37,11 +37,11 @@ public: virtual int accept (be_visitor* visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); protected: /// Overridden method. - virtual void compute_tc_name (void); + virtual void compute_tc_name (); // Compute and return the value. @@ -50,7 +50,7 @@ protected: * prefix, but the default compute_repoID() uses the #pragma's to * obtain prefixes. */ - virtual void compute_repoID (void); + virtual void compute_repoID (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_provides.h b/TAO/TAO_IDL/be_include/be_provides.h index 085659a1a5c..0f73ab08577 100644 --- a/TAO/TAO_IDL/be_include/be_provides.h +++ b/TAO/TAO_IDL/be_include/be_provides.h @@ -17,16 +17,16 @@ public: be_provides (UTL_ScopedName *n, AST_Type *provides_type); - virtual ~be_provides (void); + virtual ~be_provides (); // Non-virtual override of frontend method. - be_type *provides_type (void) const; + be_type *provides_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // BE_PROVIDES_H diff --git a/TAO/TAO_IDL/be_include/be_publishes.h b/TAO/TAO_IDL/be_include/be_publishes.h index 56082dbb30b..7a68c3fe304 100644 --- a/TAO/TAO_IDL/be_include/be_publishes.h +++ b/TAO/TAO_IDL/be_include/be_publishes.h @@ -16,16 +16,16 @@ public: be_publishes (UTL_ScopedName *n, AST_Type *publishes_type); - virtual ~be_publishes (void); + virtual ~be_publishes (); // Non-virtual override of frontend method. - be_eventtype *publishes_type (void) const; + be_eventtype *publishes_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif // BE_PUBLISHES_H diff --git a/TAO/TAO_IDL/be_include/be_root.h b/TAO/TAO_IDL/be_include/be_root.h index 67e6e22076f..44a6ac9118c 100644 --- a/TAO/TAO_IDL/be_include/be_root.h +++ b/TAO/TAO_IDL/be_include/be_root.h @@ -28,10 +28,10 @@ class be_root : public virtual AST_Root, public: be_root (UTL_ScopedName *n); - virtual ~be_root (void); + virtual ~be_root (); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_scope.h b/TAO/TAO_IDL/be_include/be_scope.h index db945b89d05..6eab19ad9e0 100644 --- a/TAO/TAO_IDL/be_include/be_scope.h +++ b/TAO/TAO_IDL/be_include/be_scope.h @@ -33,13 +33,13 @@ class be_scope : public virtual UTL_Scope { public: /// Default constructor. - be_scope (void); + be_scope (); /// Constructor that sets the node type. be_scope (AST_Decl::NodeType nt); /// Destructor. - virtual ~be_scope (void); + virtual ~be_scope (); /// To access the protected base class method fe_add_field. AST_Field *be_add_field (AST_Field *f); @@ -51,13 +51,13 @@ public: virtual void comma (unsigned short set); /// Get the comma producing state. - int comma (void) const; + int comma () const; /// Return the be_decl node corresponding to this scope node. - virtual be_decl *decl (void); + virtual be_decl *decl (); /// Recursively clean up scope members. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_sequence.h b/TAO/TAO_IDL/be_include/be_sequence.h index d7ccb6bd417..6d2deb80317 100644 --- a/TAO/TAO_IDL/be_include/be_sequence.h +++ b/TAO/TAO_IDL/be_include/be_sequence.h @@ -54,33 +54,33 @@ public: bool abstract); // Non-virtual override of frontend method. - be_type *base_type (void) const; + be_type *base_type () const; /// Create a name for ourselves. If we are typedefed, then we get the name of /// the typedef node, else we generate a name for ourselves. virtual int create_name (be_typedef *node); /// Return the managed type. - virtual MANAGED_TYPE managed_type (void); + virtual MANAGED_TYPE managed_type (); // Scope management functions. virtual AST_Sequence *fe_add_sequence (AST_Sequence *); /// Overridden method on the be_scope class. - virtual be_decl *decl (void); + virtual be_decl *decl (); /// Overridden from class be_type. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); /// Report the instance name for instantiation. - const char *instance_name (void); + const char *instance_name (); /// Common code for generating the name and parameters of our /// template sequence base class. @@ -89,16 +89,16 @@ public: AST_Decl *elem_scope); /// Accessors for the member. - be_field *field_node (void) const; + be_field *field_node () const; void field_node (be_field *node); /// Helper to create_name, also used by the traits visitor. - virtual char *gen_name (void); + virtual char *gen_name (); protected: /// Computes the fully scoped typecode name. - virtual void compute_tc_name (void); + virtual void compute_tc_name (); private: const char *smart_fwd_helper_name (AST_Decl *elem_scope, diff --git a/TAO/TAO_IDL/be_include/be_string.h b/TAO/TAO_IDL/be_include/be_string.h index 828482b47cc..0535b0596a4 100644 --- a/TAO/TAO_IDL/be_include/be_string.h +++ b/TAO/TAO_IDL/be_include/be_string.h @@ -39,11 +39,11 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); protected: /// Overridden method to compute typecode name. - virtual void compute_tc_name (void); + virtual void compute_tc_name (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_structure.h b/TAO/TAO_IDL/be_include/be_structure.h index fafbbc102d9..cb3014abab6 100644 --- a/TAO/TAO_IDL/be_include/be_structure.h +++ b/TAO/TAO_IDL/be_include/be_structure.h @@ -44,7 +44,7 @@ public: bool use_underscore); /// Cleanup method. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_structure_fwd.h b/TAO/TAO_IDL/be_include/be_structure_fwd.h index 1660b62f4da..25a5ed2f5a5 100644 --- a/TAO/TAO_IDL/be_include/be_structure_fwd.h +++ b/TAO/TAO_IDL/be_include/be_structure_fwd.h @@ -32,10 +32,10 @@ public: be_structure_fwd (AST_Structure *dummy, UTL_ScopedName *n); - virtual ~be_structure_fwd (void); + virtual ~be_structure_fwd (); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_template_module.h b/TAO/TAO_IDL/be_include/be_template_module.h index 266fa5e8054..7ca8bb91071 100644 --- a/TAO/TAO_IDL/be_include/be_template_module.h +++ b/TAO/TAO_IDL/be_include/be_template_module.h @@ -32,9 +32,9 @@ public: UTL_ScopedName *n, FE_Utils::T_PARAMLIST_INFO *template_params); - virtual ~be_template_module (void); + virtual ~be_template_module (); - virtual void destroy (void); + virtual void destroy (); virtual int accept (be_visitor *visitor); }; diff --git a/TAO/TAO_IDL/be_include/be_template_module_inst.h b/TAO/TAO_IDL/be_include/be_template_module_inst.h index 688eeb9f6b4..2d5c917761f 100644 --- a/TAO/TAO_IDL/be_include/be_template_module_inst.h +++ b/TAO/TAO_IDL/be_include/be_template_module_inst.h @@ -14,10 +14,10 @@ public: AST_Template_Module *ref, FE_Utils::T_ARGLIST *template_args); - virtual ~be_template_module_inst (void); + virtual ~be_template_module_inst (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_template_module_ref.h b/TAO/TAO_IDL/be_include/be_template_module_ref.h index 0c7ca861f38..202d2a86b74 100644 --- a/TAO/TAO_IDL/be_include/be_template_module_ref.h +++ b/TAO/TAO_IDL/be_include/be_template_module_ref.h @@ -15,10 +15,10 @@ public: AST_Template_Module *ref, UTL_StrList *param_refs); - virtual ~be_template_module_ref (void); + virtual ~be_template_module_ref (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_type.h b/TAO/TAO_IDL/be_include/be_type.h index 66fedcba55d..e70c6e2c9fc 100644 --- a/TAO/TAO_IDL/be_include/be_type.h +++ b/TAO/TAO_IDL/be_include/be_type.h @@ -28,14 +28,14 @@ public: be_type (AST_Decl::NodeType nt, UTL_ScopedName *n); - virtual ~be_type (void); + virtual ~be_type (); /** * Return the typecode name. When both, the prefix and the suffix * are non null, it computes and returns a tc name. Else, it also * stores the result in a member variable. */ - UTL_ScopedName *tc_name (void); + UTL_ScopedName *tc_name (); /// Type name of a node used when generating declarations for smart /// proxies. @@ -44,7 +44,7 @@ public: const char *prefix = 0); /// Compute the value of the member. - void gen_fwd_helper_name (void); + void gen_fwd_helper_name (); /// No-op, overridden in derived classes. virtual void gen_ostream_operator (TAO_OutStream *os, @@ -57,7 +57,7 @@ public: bool accessor = false); /// Accessor to the member. - const char *fwd_helper_name (void) const; + const char *fwd_helper_name () const; void fwd_helper_name (const char *name); /// Generate _var and _out typedefs for structs and unions. @@ -67,11 +67,11 @@ public: void gen_stub_decls (TAO_OutStream *os); /// Accessors for the member. - bool seen_in_sequence (void) const; + bool seen_in_sequence () const; virtual void seen_in_sequence (bool val); /// Accessors for the member. - bool seen_in_operation (void) const; + bool seen_in_operation () const; virtual void seen_in_operation (bool val); /** @@ -80,17 +80,17 @@ public: * recursive simply using "base_type->node_type()" will not work, so * the most "unaliased" type is needed. */ - virtual AST_Decl::NodeType base_node_type (void) const; + virtual AST_Decl::NodeType base_node_type () const; /// Clean up allocated members. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); protected: /// Computes the fully scoped typecode name. - virtual void compute_tc_name (void); + virtual void compute_tc_name (); /// Typecode name. UTL_ScopedName *tc_name_; diff --git a/TAO/TAO_IDL/be_include/be_typedef.h b/TAO/TAO_IDL/be_include/be_typedef.h index d05f7707a36..b1f3bfb5708 100644 --- a/TAO/TAO_IDL/be_include/be_typedef.h +++ b/TAO/TAO_IDL/be_include/be_typedef.h @@ -31,16 +31,16 @@ public: /// Overrides for be_type members. If we have been /// defined, we want the underlying type to be set as well. virtual void seen_in_sequence (bool val); - virtual bool seen_in_operation (void) const; + virtual bool seen_in_operation () const; virtual void seen_in_operation (bool val); /// Return the most primitive base type by traversing the chain of typedefed /// base types. - be_type *primitive_base_type (void); + be_type *primitive_base_type (); /// Return the most "unaliased" type node for the base type (see /// be_type.h). - virtual AST_Decl::NodeType base_node_type (void) const; + virtual AST_Decl::NodeType base_node_type () const; /// Overridden from class be_type. virtual void gen_member_ostream_operator (TAO_OutStream *os, @@ -49,7 +49,7 @@ public: bool accessor = false); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor *visitor); diff --git a/TAO/TAO_IDL/be_include/be_union.h b/TAO/TAO_IDL/be_include/be_union.h index 92083e831d4..2ffb8c2a4e0 100644 --- a/TAO/TAO_IDL/be_include/be_union.h +++ b/TAO/TAO_IDL/be_include/be_union.h @@ -35,28 +35,28 @@ public: virtual void redefine (AST_Structure *from); /// Do we have at least one member with multiple case labels? - virtual bool has_duplicate_case_labels (void); + virtual bool has_duplicate_case_labels (); /// Overridden from class be_type. virtual void gen_ostream_operator (TAO_OutStream *os, bool use_underscore); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); /// Visiting. virtual int accept (be_visitor *visitor); /// Decides whether a default switch case label in the generated copy /// constructor, assignment operator, etc. is needed. - bool gen_empty_default_label (void); + bool gen_empty_default_label (); /// Just a way to get at fe_add_union_branch() from the backend. AST_UnionBranch *be_add_union_branch (AST_UnionBranch *b); /// Returns total number of labels, useful when the union has /// multiple case labels. - ACE_UINT64 nlabels (void); + ACE_UINT64 nlabels (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_union_branch.h b/TAO/TAO_IDL/be_include/be_union_branch.h index 9c61769b2bd..e00a9419804 100644 --- a/TAO/TAO_IDL/be_include/be_union_branch.h +++ b/TAO/TAO_IDL/be_include/be_union_branch.h @@ -43,7 +43,7 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_union_fwd.h b/TAO/TAO_IDL/be_include/be_union_fwd.h index b9e9c73f542..76b5673dcc0 100644 --- a/TAO/TAO_IDL/be_include/be_union_fwd.h +++ b/TAO/TAO_IDL/be_include/be_union_fwd.h @@ -31,10 +31,10 @@ public: be_union_fwd (AST_Union *dummy, UTL_ScopedName *n); - virtual ~be_union_fwd (void); + virtual ~be_union_fwd (); /// Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int accept (be_visitor* visitor); diff --git a/TAO/TAO_IDL/be_include/be_union_label.h b/TAO/TAO_IDL/be_include/be_union_label.h index 413a821b302..0d9416f464c 100644 --- a/TAO/TAO_IDL/be_include/be_union_label.h +++ b/TAO/TAO_IDL/be_include/be_union_label.h @@ -15,7 +15,7 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif diff --git a/TAO/TAO_IDL/be_include/be_uses.h b/TAO/TAO_IDL/be_include/be_uses.h index 80cf76f975a..873b0c57f36 100644 --- a/TAO/TAO_IDL/be_include/be_uses.h +++ b/TAO/TAO_IDL/be_include/be_uses.h @@ -17,16 +17,16 @@ public: AST_Type *uses_type, bool is_multiple); - virtual ~be_uses (void); + virtual ~be_uses (); // Non-virtual override of frontend method. - be_type *uses_type (void) const; + be_type *uses_type () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); void original_uses (be_uses *original_uses); // Sets the original uses from which this one was created, diff --git a/TAO/TAO_IDL/be_include/be_util.h b/TAO/TAO_IDL/be_include/be_util.h index ab65c5cafcd..159ae016118 100644 --- a/TAO/TAO_IDL/be_include/be_util.h +++ b/TAO/TAO_IDL/be_include/be_util.h @@ -48,15 +48,15 @@ public: /// Checks made after parsing args. static TAO_IDL_BE_Export void - arg_post_proc (void); + arg_post_proc (); /// Display usage of BE-specific options. static TAO_IDL_BE_Export void - usage (void); + usage (); /// Create an AST node generator. static TAO_IDL_BE_Export AST_Generator * - generator_init (void); + generator_init (); /// Called from various places. static const char * @@ -67,7 +67,7 @@ public: /// Called from various places. static bool - overwrite_ciao_exec_files (void); + overwrite_ciao_exec_files (); // Called by each node upon construction. static void set_arg_seen_bit (be_type *); diff --git a/TAO/TAO_IDL/be_include/be_valuebox.h b/TAO/TAO_IDL/be_include/be_valuebox.h index 6a1e4292f48..9ae4448823d 100644 --- a/TAO/TAO_IDL/be_include/be_valuebox.h +++ b/TAO/TAO_IDL/be_include/be_valuebox.h @@ -30,7 +30,7 @@ public: virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); }; #endif /* TAO_BE_VALUEBOX_H */ diff --git a/TAO/TAO_IDL/be_include/be_valuetype.h b/TAO/TAO_IDL/be_include/be_valuetype.h index 5dc0e9e5e47..38c8a990ba7 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype.h +++ b/TAO/TAO_IDL/be_include/be_valuetype.h @@ -41,12 +41,12 @@ public: bool truncatable, bool custom); - ~be_valuetype (void); + ~be_valuetype (); virtual void redefine (AST_Interface *from); /// Should generate optimized form? - bool opt_accessor (void); + bool opt_accessor (); /// Generate the helper functions definition. virtual int gen_helper_header (char *local_name = 0, @@ -66,17 +66,17 @@ public: /// Generate the declarations used by the template _var, _out /// classes for valuetypes, and by sequence template classes. - void gen_var_out_seq_decls (void); + void gen_var_out_seq_decls (); /// Retrieve the fully scoped skel class name. - const char *full_obv_skel_name (void); + const char *full_obv_skel_name (); - const char *field_pd_prefix (void); + const char *field_pd_prefix (); - const char *field_pd_postfix (void); + const char *field_pd_postfix (); // For building the name for private data fields. - be_valuetype *statefull_inherit (void); + be_valuetype *statefull_inherit (); /// Load the insert queue with all the interfaces we support, and /// call the generic version of traverse_inheritance_graph(). @@ -95,16 +95,16 @@ public: ); /// Do we support at least one abstract interface? - bool supports_abstract (void) const; + bool supports_abstract () const; // Visiting. virtual int accept (be_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); /// Compute the fully scoped skel class name. - void compute_fullobvskelname (void); + void compute_fullobvskelname (); /// Compute the count of private/public/all data members. ACE_CDR::ULong data_members_count ( @@ -118,7 +118,7 @@ public: TAO_OutStream *os); /// Accessor to the member. - const char *fwd_helper_name (void) const; + const char *fwd_helper_name () const; // There are three possible situations. // (1) If there is no initializers but at least one operation. @@ -141,24 +141,24 @@ public: }; /// Determine what kind of factory needed. - FactoryStyle determine_factory_style (void); + FactoryStyle determine_factory_style (); /// Recurse down the inheritance tree to determine /// if valuetype has at least one operation/attribute. - bool have_operation (void); + bool have_operation (); /// Check if VT supports an interface with at least 1 operation. static bool have_supported_op (be_interface *node); /// Use the above enum and methods to determine this after the /// node's scope is visited but before code generation. - virtual bool will_have_factory (void); + virtual bool will_have_factory (); /// Decides whether to generate the initializing contstructor or not. - bool has_member (void); + bool has_member (); /// Accessors for the member - bool is_amh_excep_holder (void) const; + bool is_amh_excep_holder () const; void is_amh_excep_holder (bool val); private: diff --git a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h index b72174d3a4e..4c0063ce7e9 100644 --- a/TAO/TAO_IDL/be_include/be_valuetype_fwd.h +++ b/TAO/TAO_IDL/be_include/be_valuetype_fwd.h @@ -31,13 +31,13 @@ public: be_valuetype_fwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~be_valuetype_fwd (void); + virtual ~be_valuetype_fwd (); // Visiting. virtual int accept (be_visitor* visitor); // Cleanup - virtual void destroy (void); + virtual void destroy (); }; #endif // if !defined diff --git a/TAO/TAO_IDL/be_include/be_visitor.h b/TAO/TAO_IDL/be_include/be_visitor.h index e6ec9470ee7..ca89ed5f9c8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor.h +++ b/TAO/TAO_IDL/be_include/be_visitor.h @@ -85,7 +85,7 @@ class TAO_OutStream; class be_visitor { public: - virtual ~be_visitor (void); + virtual ~be_visitor (); virtual int visit_decl (be_decl *d); virtual int visit_scope (be_scope *node); @@ -142,7 +142,7 @@ public: protected: // Not abstract but we want to force subclassing anyway. - be_visitor (void); + be_visitor (); }; #endif // TAO_BE_VISITOR_H diff --git a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h index 0bee5dc3f84..14f2b23ff33 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_amh_pre_proc.h @@ -37,7 +37,7 @@ private: public: be_visitor_amh_pre_proc (be_visitor_context *ctx); - virtual ~be_visitor_amh_pre_proc (void); + virtual ~be_visitor_amh_pre_proc (); virtual int visit_root (be_root *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h index d1706c12e24..a2f9f2ff70a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_ami_pre_proc.h @@ -41,7 +41,7 @@ private: public: be_visitor_ami_pre_proc (be_visitor_context *ctx); - virtual ~be_visitor_ami_pre_proc (void); + virtual ~be_visitor_ami_pre_proc (); virtual int visit_root (be_root *node); @@ -94,7 +94,7 @@ private: long &n_parents); /// Generate an *A.idl file for AMI4CCM. - int generate_ami4ccm_idl (void); + int generate_ami4ccm_idl (); }; #endif // TAO_BE_VISITOR_AMI_PRE_PROC_H diff --git a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h index deec0954961..395dae51fd6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_any_extracted_type_decl.h @@ -29,7 +29,7 @@ class be_visitor_any_extracted_type_decl : public be_visitor_decl { public: be_visitor_any_extracted_type_decl (be_visitor_context *ctx); - virtual ~be_visitor_any_extracted_type_decl (void); + virtual ~be_visitor_any_extracted_type_decl (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h index a9cb4413182..761859541eb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h +++ b/TAO/TAO_IDL/be_include/be_visitor_arg_traits.h @@ -24,7 +24,7 @@ public: be_visitor_arg_traits (const char *S, be_visitor_context *ctx); - virtual ~be_visitor_arg_traits (void); + virtual ~be_visitor_arg_traits (); virtual int visit_root (be_root *node); virtual int visit_module (be_module *node); @@ -58,7 +58,7 @@ private: void generated (be_decl *node, bool val); - const char *insert_policy (void); + const char *insert_policy (); private: char *S_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h index 50bdba259e6..e1ae99ec493 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/arglist.h @@ -35,7 +35,7 @@ public: be_visitor_args_arglist (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_arglist (void); + virtual ~be_visitor_args_arglist (); /// visit the argument node virtual int visit_argument (be_argument *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h index 0985975fce0..2f320a41943 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/argument.h @@ -36,7 +36,7 @@ public: be_visitor_args (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args (void); + virtual ~be_visitor_args (); //= helper /// helper that produces either a nested name for @@ -45,7 +45,7 @@ public: const char *suffix = 0); /// return the direction of the argument node - virtual AST_Argument::Direction direction (void); + virtual AST_Argument::Direction direction (); /// must be overridden by derived classes virtual int visit_argument (be_argument *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h index 49a1a650456..023e96be6c2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/invoke_cs.h @@ -32,7 +32,7 @@ public: be_visitor_args_invoke_cs (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_invoke_cs (void); + virtual ~be_visitor_args_invoke_cs (); /// visit the argument node virtual int visit_argument (be_argument *node); @@ -93,7 +93,7 @@ public: virtual int visit_home (be_home *node); private: - int emit_common (void); + int emit_common (); int emit_common2 (be_type *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h index c7cd4332015..05e7225bd3b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/marshal_ss.h @@ -32,7 +32,7 @@ public: be_visitor_args_marshal_ss (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_marshal_ss (void); + virtual ~be_visitor_args_marshal_ss (); /// visit the argument node virtual int visit_argument (be_argument *node); @@ -94,7 +94,7 @@ public: virtual int visit_home (be_home *node); private: - int emit_common (void); + int emit_common (); int emit_common2 (be_type *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h index 6a91ca39d3d..42b8d547675 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/upcall_ss.h @@ -32,7 +32,7 @@ public: be_visitor_args_upcall_ss (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_upcall_ss (void); + virtual ~be_visitor_args_upcall_ss (); /// visit the argument node virtual int visit_argument (be_argument *node); @@ -91,7 +91,7 @@ public: virtual int visit_eventtype_fwd (be_eventtype_fwd *node); private: - int emit_common (void); + int emit_common (); int emit_common2 (be_type *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h index 6fee17d07a4..0fc6fd6c3a0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_argument/vardecl_ss.h @@ -32,7 +32,7 @@ public: be_visitor_args_vardecl_ss (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_args_vardecl_ss (void); + virtual ~be_visitor_args_vardecl_ss (); /// visit the argument node virtual int visit_argument (be_argument *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h index 5fd66b6c4ea..b6463d0753f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_ch.h @@ -34,7 +34,7 @@ public: be_visitor_array_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_array_any_op_ch (void); + ~be_visitor_array_any_op_ch (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h index 85040aae980..776a873402e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/any_op_cs.h @@ -34,7 +34,7 @@ public: be_visitor_array_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_array_any_op_cs (void); + ~be_visitor_array_any_op_cs (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array.h b/TAO/TAO_IDL/be_include/be_visitor_array/array.h index 42fa8a82bc4..b44e9e6a4a2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array.h @@ -31,7 +31,7 @@ public: be_visitor_array (be_visitor_context *ctx); /// destructor - ~be_visitor_array (void); + ~be_visitor_array (); /// visit the array node virtual int visit_array (be_array *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h index 88742879048..4f0d219a1e6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ch.h @@ -31,7 +31,7 @@ public: be_visitor_array_ch (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_array_ch (void); + virtual ~be_visitor_array_ch (); /// visit the array node virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h index b4b1afeacc6..67ff101da07 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_ci.h @@ -31,7 +31,7 @@ public: be_visitor_array_ci (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_array_ci (void); + virtual ~be_visitor_array_ci (); /// visit the array node virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h index 81be7e8326b..43f734b8916 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/array_cs.h @@ -31,7 +31,7 @@ public: be_visitor_array_cs (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_array_cs (void); + virtual ~be_visitor_array_cs (); /// visit the array node virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h index 78e3f4614e0..fbcfc930785 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_ch.h @@ -34,7 +34,7 @@ public: be_visitor_array_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_array_cdr_op_ch (void); + ~be_visitor_array_cdr_op_ch (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h index 73ea075826d..e7d71720731 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_array/cdr_op_cs.h @@ -38,7 +38,7 @@ public: be_visitor_array_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_array_cdr_op_cs (void); + ~be_visitor_array_cdr_op_cs (); /// visit array virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h b/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h index 2366290a19b..a3d6a8c23e0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attr_assign.h @@ -28,7 +28,7 @@ class be_visitor_attr_assign : public be_visitor_decl { public: be_visitor_attr_assign (be_visitor_context *ctx); - virtual ~be_visitor_attr_assign (void); + virtual ~be_visitor_attr_assign (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_init.h b/TAO/TAO_IDL/be_include/be_visitor_attr_init.h index 19400767577..25b6bbdfdfb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attr_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attr_init.h @@ -30,7 +30,7 @@ class be_visitor_attr_init : public be_visitor_decl { public: be_visitor_attr_init (be_visitor_context *ctx); - virtual ~be_visitor_attr_init (void); + virtual ~be_visitor_attr_init (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_return.h b/TAO/TAO_IDL/be_include/be_visitor_attr_return.h index 32bc38e5b80..b29dad5b384 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attr_return.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attr_return.h @@ -28,7 +28,7 @@ class be_visitor_attr_return : public be_visitor_decl { public: be_visitor_attr_return (be_visitor_context *ctx); - virtual ~be_visitor_attr_return (void); + virtual ~be_visitor_attr_return (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h b/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h index 097d0f51695..e3acaf6a237 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attr_setarg_type.h @@ -28,7 +28,7 @@ class be_visitor_attr_setarg_type : public be_visitor_decl { public: be_visitor_attr_setarg_type (be_visitor_context *ctx); - virtual ~be_visitor_attr_setarg_type (void); + virtual ~be_visitor_attr_setarg_type (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h index d4345eb8312..61269d1923e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/attribute.h @@ -33,7 +33,7 @@ public: be_visitor_attribute (be_visitor_context *ctx); /// destructor - ~be_visitor_attribute (void); + ~be_visitor_attribute (); /// visit attribute. We provide code for this method in the derived class virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h index cdc80407df6..faf5717dc9f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/ccm_init.h @@ -21,7 +21,7 @@ class be_visitor_attribute_ccm_init { public: be_visitor_attribute_ccm_init (be_visitor_context *ctx); - ~be_visitor_attribute_ccm_init (void); + ~be_visitor_attribute_ccm_init (); virtual int visit_attribute (be_attribute *node); @@ -41,10 +41,10 @@ public: virtual int visit_valuetype (be_valuetype *node); private: - void emit_init_block (void); + void emit_init_block (); void emit_error (const char *); - void open_if_block (void); - void close_if_block (void); + void open_if_block (); + void close_if_block (); private: be_attribute *attr_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h index 3f8c1451e37..dbf36935d64 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h +++ b/TAO/TAO_IDL/be_include/be_visitor_attribute/set_from_extracted.h @@ -23,7 +23,7 @@ class be_visitor_attribute_set_from_extracted { public: be_visitor_attribute_set_from_extracted (be_visitor_context *ctx); - virtual ~be_visitor_attribute_set_from_extracted (void); + virtual ~be_visitor_attribute_set_from_extracted (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h index e90a16bae17..16574898820 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_ccm_pre_proc.h @@ -36,7 +36,7 @@ class be_visitor_ccm_pre_proc : public be_visitor_component_scope public: be_visitor_ccm_pre_proc (be_visitor_context *ctx); - virtual ~be_visitor_ccm_pre_proc (void); + virtual ~be_visitor_ccm_pre_proc (); virtual int visit_root (be_root *node); virtual int visit_module (be_module *node); @@ -83,8 +83,8 @@ protected: // Utility functions to create and destroy the various things // needed by operations generated from CCM-related declarations. - int lookup_cookie (void); - int lookup_exceptions (void); + int lookup_cookie (); + int lookup_exceptions (); int lookup_one_exception (const char *name, be_exception *&result); @@ -130,7 +130,7 @@ protected: private: /// Generate a sendc_* receptacle for AMI4CCM. - int generate_ami4ccm_uses (void); + int generate_ami4ccm_uses (); }; #endif // TAO_BE_VISITOR_CCM_PRE_PROC_H diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component.h b/TAO/TAO_IDL/be_include/be_visitor_component/component.h index fc6a2ae7d11..5e3975cb5ac 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component.h @@ -28,7 +28,7 @@ class be_visitor_component : public be_visitor_interface public: be_visitor_component (be_visitor_context *ctx); - ~be_visitor_component (void); + ~be_visitor_component (); /// This is the only type of declaration a component may contain. virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h index 78fb8a14329..829b63ccccb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_ex_base.h @@ -27,16 +27,16 @@ class be_visitor_component_ami_rh_ex_base // public: be_visitor_component_ami_rh_ex_base (be_visitor_context *ctx); - ~be_visitor_component_ami_rh_ex_base (void); + ~be_visitor_component_ami_rh_ex_base (); virtual int post_process (be_decl *node); protected: - void init (void); + void init (); void gen_excep_op (const char *prefix, be_decl *node, bool for_defn); - virtual void gen_op_body (void); + virtual void gen_op_body (); int gen_attr_op (be_attribute *node, bool for_defn); protected: diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h index 37efdb86745..2ac3bf00095 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exh.h @@ -31,7 +31,7 @@ class be_visitor_component_ami_rh_exh { public: be_visitor_component_ami_rh_exh (be_visitor_context *ctx); - ~be_visitor_component_ami_rh_exh (void); + ~be_visitor_component_ami_rh_exh (); virtual int visit_uses (be_uses *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h index 739153e57e0..73abcca2ec0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ami_rh_exs.h @@ -26,7 +26,7 @@ class be_visitor_component_ami_rh_exs { public: be_visitor_component_ami_rh_exs (be_visitor_context *ctx); - ~be_visitor_component_ami_rh_exs (void); + ~be_visitor_component_ami_rh_exs (); virtual int visit_uses (be_uses *node); virtual int visit_operation (be_operation *node); @@ -34,7 +34,7 @@ public: virtual int visit_argument (be_argument *node); private: - virtual void gen_op_body (void); + virtual void gen_op_body (); private: const char *your_code_here_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h index 5dd4a88f38a..77b70d453b1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_ex_idl.h @@ -26,7 +26,7 @@ class be_visitor_component_ex_idl : public be_visitor_decl public: be_visitor_component_ex_idl (be_visitor_context *ctx); - ~be_visitor_component_ex_idl (void); + ~be_visitor_component_ex_idl (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h index 2021bc1e6ff..61c3b1f1485 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exh.h @@ -24,7 +24,7 @@ class be_visitor_component_exh public: be_visitor_component_exh (be_visitor_context *ctx); - ~be_visitor_component_exh (void); + ~be_visitor_component_exh (); virtual int visit_component (be_component *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h index fe7c1a0fb13..41a29abe673 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_exs.h @@ -24,7 +24,7 @@ class be_visitor_component_exs public: be_visitor_component_exs (be_visitor_context *ctx); - ~be_visitor_component_exs (void); + ~be_visitor_component_exs (); virtual int visit_component (be_component *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h index 45afd4bc706..f81b2d6028c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svh.h @@ -25,7 +25,7 @@ class be_visitor_component_svh : public be_visitor_component public: be_visitor_component_svh (be_visitor_context *ctx); - ~be_visitor_component_svh (void); + ~be_visitor_component_svh (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h index 0777596da3f..931064ae3f6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svs.h @@ -26,7 +26,7 @@ class be_visitor_component_svs : public be_visitor_component public: be_visitor_component_svs (be_visitor_context *ctx); - ~be_visitor_component_svs (void); + ~be_visitor_component_svs (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h index c0ddc17c692..fb020ceb515 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svth.h @@ -25,7 +25,7 @@ class be_visitor_component_svth : public be_visitor_component public: be_visitor_component_svth (be_visitor_context *ctx); - ~be_visitor_component_svth (void); + ~be_visitor_component_svth (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h b/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h index 0ece376fd87..778463cbb16 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/component_svts.h @@ -26,7 +26,7 @@ class be_visitor_component_svts : public be_visitor_component public: be_visitor_component_svts (be_visitor_context *ctx); - ~be_visitor_component_svts (void); + ~be_visitor_component_svts (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h index e4231f9943b..a534f6d12d9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_ex_idl.h @@ -23,7 +23,7 @@ class be_visitor_context_ex_idl public: be_visitor_context_ex_idl (be_visitor_context *ctx); - ~be_visitor_context_ex_idl (void); + ~be_visitor_context_ex_idl (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h index b3156428bb8..0b6f076c0e9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svth.h @@ -27,7 +27,7 @@ class be_visitor_context_svth : public be_visitor_component_scope public: be_visitor_context_svth (be_visitor_context *ctx); - ~be_visitor_context_svth (void); + ~be_visitor_context_svth (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h b/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h index 6feac150d01..853502b3bb2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/context_svts.h @@ -27,7 +27,7 @@ class be_visitor_context_svts : public be_visitor_component_scope public: be_visitor_context_svts (be_visitor_context *ctx); - ~be_visitor_context_svts (void); + ~be_visitor_context_svts (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h index c10c1d73d01..e23af8df907 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_ex_idl.h @@ -22,7 +22,7 @@ class be_visitor_executor_ex_idl public: be_visitor_executor_ex_idl (be_visitor_context *ctx); - ~be_visitor_executor_ex_idl (void); + ~be_visitor_executor_ex_idl (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); @@ -39,7 +39,7 @@ public: virtual int visit_consumes (be_consumes *node); private: - void gen_supported (void); + void gen_supported (); void gen_exception_list (UTL_ExceptList *exceptions, const char *prefix = "", bool closed = true); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h index 84ee7523a66..1cd0a6e29d6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exh.h @@ -23,7 +23,7 @@ class be_visitor_executor_exh public: be_visitor_executor_exh (be_visitor_context *ctx); - ~be_visitor_executor_exh (void); + ~be_visitor_executor_exh (); virtual int visit_attribute (be_attribute *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h index a0298e2e982..114f5683ca8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs.h @@ -23,7 +23,7 @@ class be_visitor_executor_exs public: be_visitor_executor_exs (be_visitor_context *ctx); - ~be_visitor_executor_exs (void); + ~be_visitor_executor_exs (); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h index 03bb5bd5045..4f0f18e75fe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_exs_attr_init.h @@ -24,13 +24,13 @@ class be_visitor_executor_exs_attr_init { public: be_visitor_executor_exs_attr_init (be_visitor_context *ctx); - ~be_visitor_executor_exs_attr_init (void); + ~be_visitor_executor_exs_attr_init (); virtual int visit_attribute (be_attribute *node); virtual int pre_process (be_decl *); - bool attr_generated (void) const; + bool attr_generated () const; private: bool semicolon_generated_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h index da954b17b92..0db0f40a4db 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/executor_private_exh.h @@ -24,7 +24,7 @@ class be_visitor_executor_private_exh public: be_visitor_executor_private_exh (be_visitor_context *ctx); - ~be_visitor_executor_private_exh (void); + ~be_visitor_executor_private_exh (); virtual int visit_provides (be_provides *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h index 8a436a2f141..35ff340d2ea 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exh.h @@ -22,7 +22,7 @@ class be_visitor_facet_exh public: be_visitor_facet_exh (be_visitor_context *ctx); - ~be_visitor_facet_exh (void); + ~be_visitor_facet_exh (); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h index 54c1a9aaf2f..19afab63fd4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/facet_exs.h @@ -23,7 +23,7 @@ class be_visitor_facet_exs public: be_visitor_facet_exs (be_visitor_context *ctx); - ~be_visitor_facet_exs (void); + ~be_visitor_facet_exs (); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h index f30c73b57ef..b9f017e416f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svh.h @@ -27,7 +27,7 @@ class be_visitor_servant_svh : public be_visitor_component_scope public: be_visitor_servant_svh (be_visitor_context *ctx); - ~be_visitor_servant_svh (void); + ~be_visitor_servant_svh (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); @@ -40,7 +40,7 @@ public: private: /// Base class overrides and CIAO-specific code. - void gen_non_type_specific (void); + void gen_non_type_specific (); }; #endif /* _BE_COMPONENT_SERVANT_SVH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h index 659ef708fb6..f9cac557f89 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component/servant_svs.h @@ -24,7 +24,7 @@ class be_visitor_servant_svs public: be_visitor_servant_svs (be_visitor_context *ctx); - ~be_visitor_servant_svs (void); + ~be_visitor_servant_svs (); virtual int visit_component (be_component *node); virtual int visit_connector (be_connector *node); @@ -37,15 +37,15 @@ public: virtual int visit_consumes (be_consumes *node); private: - void gen_provides_top (void); - void gen_uses_top (void); - void gen_publishes_top (void); - void gen_emits_top (void); + void gen_provides_top (); + void gen_uses_top (); + void gen_publishes_top (); + void gen_emits_top (); /// This method gets generated (unless we are /// generating the LwCCM profile) whether the /// comonent has any emitters or not. - void gen_get_all_emitters (void); + void gen_get_all_emitters (); private: be_interface *op_scope_; @@ -59,7 +59,7 @@ class be_visitor_obv_factory_reg public: be_visitor_obv_factory_reg (be_visitor_context *ctx); - ~be_visitor_obv_factory_reg (void); + ~be_visitor_obv_factory_reg (); virtual int visit_publishes (be_publishes *node); virtual int visit_emits (be_emits *node); @@ -76,7 +76,7 @@ class be_visitor_attr_set : public be_visitor_component_scope public: be_visitor_attr_set (be_visitor_context *ctx); - ~be_visitor_attr_set (void); + ~be_visitor_attr_set (); virtual int visit_attribute (be_attribute *node); @@ -94,7 +94,7 @@ class be_visitor_facet_executor_block public: be_visitor_facet_executor_block (be_visitor_context *ctx); - ~be_visitor_facet_executor_block (void); + ~be_visitor_facet_executor_block (); virtual int visit_provides (be_provides *node); }; @@ -107,7 +107,7 @@ class be_visitor_connect_block public: be_visitor_connect_block (be_visitor_context *ctx); - ~be_visitor_connect_block (void); + ~be_visitor_connect_block (); virtual int visit_uses (be_uses *node); }; @@ -120,7 +120,7 @@ class be_visitor_disconnect_block public: be_visitor_disconnect_block (be_visitor_context *ctx); - ~be_visitor_disconnect_block (void); + ~be_visitor_disconnect_block (); virtual int visit_uses (be_uses *node); }; @@ -134,7 +134,7 @@ public: be_visitor_receptacle_desc (be_visitor_context *ctx, be_component *node); - ~be_visitor_receptacle_desc (void); + ~be_visitor_receptacle_desc (); virtual int visit_uses (be_uses *node); @@ -151,7 +151,7 @@ class be_visitor_subscribe_block public: be_visitor_subscribe_block (be_visitor_context *ctx); - ~be_visitor_subscribe_block (void); + ~be_visitor_subscribe_block (); virtual int visit_publishes (be_publishes *node); }; @@ -164,7 +164,7 @@ class be_visitor_unsubscribe_block public: be_visitor_unsubscribe_block (be_visitor_context *ctx); - ~be_visitor_unsubscribe_block (void); + ~be_visitor_unsubscribe_block (); virtual int visit_publishes (be_publishes *node); }; @@ -177,7 +177,7 @@ class be_visitor_event_source_desc public: be_visitor_event_source_desc (be_visitor_context *ctx); - ~be_visitor_event_source_desc (void); + ~be_visitor_event_source_desc (); virtual int visit_publishes (be_publishes *node); @@ -193,7 +193,7 @@ class be_visitor_connect_consumer_block public: be_visitor_connect_consumer_block (be_visitor_context *ctx); - ~be_visitor_connect_consumer_block (void); + ~be_visitor_connect_consumer_block (); virtual int visit_emits (be_emits *node); }; @@ -206,7 +206,7 @@ class be_visitor_disconnect_consumer_block public: be_visitor_disconnect_consumer_block (be_visitor_context *ctx); - ~be_visitor_disconnect_consumer_block (void); + ~be_visitor_disconnect_consumer_block (); virtual int visit_emits (be_emits *node); }; @@ -219,7 +219,7 @@ class be_visitor_emitter_desc public: be_visitor_emitter_desc (be_visitor_context *ctx); - ~be_visitor_emitter_desc (void); + ~be_visitor_emitter_desc (); virtual int visit_emits (be_emits *node); @@ -235,7 +235,7 @@ class be_visitor_populate_port_tables public: be_visitor_populate_port_tables (be_visitor_context *ctx); - ~be_visitor_populate_port_tables (void); + ~be_visitor_populate_port_tables (); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h index afc73f9840b..7aa27cfb24a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_component_fwd_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_component_fwd_any_op_ch (void); + ~be_visitor_component_fwd_any_op_ch (); /// visit component_fwd virtual int visit_component_fwd (be_component_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h index 85d1bb87ed8..69b53aaefe0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_component_fwd_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_component_fwd_cdr_op_ch (void); + ~be_visitor_component_fwd_cdr_op_ch (); /// visit forward declared component. virtual int visit_component_fwd (be_component_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h index f5c9d15989c..1d7ef30f688 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_fwd/component_fwd_ch.h @@ -28,7 +28,7 @@ public: be_visitor_component_fwd_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_component_fwd_ch (void); + ~be_visitor_component_fwd_ch (); /// visit interface_fwd. virtual int visit_component_fwd (be_component_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h index 476efb13582..a41c1e25a8f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_component_scope.h +++ b/TAO/TAO_IDL/be_include/be_visitor_component_scope.h @@ -30,7 +30,7 @@ class be_visitor_component_scope : public be_visitor_scope protected: be_visitor_component_scope (be_visitor_context *ctx); - virtual ~be_visitor_component_scope (void); + virtual ~be_visitor_component_scope (); public: virtual int visit_extended_port (be_extended_port *node); @@ -52,10 +52,10 @@ public: void node (be_component *c); protected: - void gen_svnt_entrypoint_decl (void); - void gen_svnt_entrypoint_defn (void); - void gen_exec_entrypoint_decl (void); - void gen_exec_entrypoint_defn (void); + void gen_svnt_entrypoint_decl (); + void gen_svnt_entrypoint_defn (); + void gen_exec_entrypoint_decl (); + void gen_exec_entrypoint_defn (); protected: be_component *node_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h index 7602b12b8d1..1e2ed19a3b2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exh.h @@ -31,12 +31,12 @@ class be_visitor_connector_ami_exh public: be_visitor_connector_ami_exh (be_visitor_context *ctx); - ~be_visitor_connector_ami_exh (void); + ~be_visitor_connector_ami_exh (); virtual int visit_connector (be_connector *node); private: - void gen_entrypoint (void); + void gen_entrypoint (); }; #endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h index f7da2c466ae..c83d58cdca7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_ami_exs.h @@ -32,12 +32,12 @@ class be_visitor_connector_ami_exs public: be_visitor_connector_ami_exs (be_visitor_context *ctx); - ~be_visitor_connector_ami_exs (void); + ~be_visitor_connector_ami_exs (); virtual int visit_connector (be_connector *node); private: - void gen_entrypoint (void); + void gen_entrypoint (); }; #endif /* _BE_CONNECTOR_CONNECTOR_AMI_EXS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h index a59c934d354..f26f839bbb8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h @@ -31,7 +31,7 @@ class be_visitor_connector_dds_ex_base public: be_visitor_connector_dds_ex_base (be_visitor_context *ctx); - ~be_visitor_connector_dds_ex_base (void); + ~be_visitor_connector_dds_ex_base (); protected: bool begin (be_connector *node); @@ -53,7 +53,7 @@ protected: private: void process_template_args (AST_Connector *node); - void match_template_args (void); + void match_template_args (); }; #endif /* _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h index 292a965fb15..b1ea70cbc72 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exh.h @@ -31,7 +31,7 @@ class be_visitor_connector_dds_exh public: be_visitor_connector_dds_exh (be_visitor_context *ctx); - ~be_visitor_connector_dds_exh (void); + ~be_visitor_connector_dds_exh (); virtual int visit_connector (be_connector *node); @@ -47,7 +47,7 @@ private: /// Generate application-specific instantiations of /// middleware templates containing traits constructs. void gen_dds_traits (AST_Decl *datatype); - void gen_connector_traits (void); + void gen_connector_traits (); /// Common code triggered by provides and uses ports. void gen_interface_connector_trait (be_interface *iface, diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h index 6b96a075509..78d220fa63d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_exs.h @@ -29,7 +29,7 @@ class be_visitor_connector_dds_exs public: be_visitor_connector_dds_exs (be_visitor_context *ctx); - ~be_visitor_connector_dds_exs (void); + ~be_visitor_connector_dds_exs (); virtual int visit_connector (be_connector *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h index 7790f43bd33..fa00e192e4b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exh.h @@ -29,7 +29,7 @@ class be_visitor_executor_ami_exh public: be_visitor_executor_ami_exh (be_visitor_context *ctx); - ~be_visitor_executor_ami_exh (void); + ~be_visitor_executor_ami_exh (); virtual int visit_connector (be_connector *node); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h index 481e06f9eda..f831e4d8169 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/executor_ami_exs.h @@ -29,7 +29,7 @@ class be_visitor_executor_ami_exs public: be_visitor_executor_ami_exs (be_visitor_context *ctx); - ~be_visitor_executor_ami_exs (void); + ~be_visitor_executor_ami_exs (); virtual int visit_connector (be_connector *node); virtual int visit_provides (be_provides *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h index 94b8e8a0dd0..67445f55335 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exh.h @@ -28,7 +28,7 @@ class be_visitor_facet_ami_exh public: be_visitor_facet_ami_exh (be_visitor_context *ctx); - ~be_visitor_facet_ami_exh (void); + ~be_visitor_facet_ami_exh (); virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); @@ -49,8 +49,8 @@ protected: bool sync_; private: - int gen_reply_handler_class (void); - int gen_facet_executor_class (void); + int gen_reply_handler_class (); + int gen_facet_executor_class (); }; //============================================================== diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h index cf98aa0efcd..d102e3ed6ab 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/facet_ami_exs.h @@ -28,7 +28,7 @@ class be_visitor_facet_ami_exs public: be_visitor_facet_ami_exs (be_visitor_context *ctx); - ~be_visitor_facet_ami_exs (void); + ~be_visitor_facet_ami_exs (); virtual int visit_component (be_component *node); virtual int visit_provides (be_provides *node); @@ -39,9 +39,9 @@ public: virtual int post_process (be_decl *node); private: - void init (void); - int gen_reply_handler_class (void); - int gen_facet_executor_class (void); + void init (); + int gen_reply_handler_class (); + int gen_facet_executor_class (); int gen_reply_hander_op (be_operation *node); int gen_facet_executor_op (be_operation *node); int gen_facet_executor_sync_op (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h index f5575874d3a..49dab12db86 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_ch.h @@ -28,7 +28,7 @@ public: be_visitor_constant_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_constant_ch (void); + ~be_visitor_constant_ch (); /// visit constant. virtual int visit_constant (be_constant *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h index 342286a8510..4979beab82e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_constant/constant_cs.h @@ -28,7 +28,7 @@ public: be_visitor_constant_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_constant_cs (void); + ~be_visitor_constant_cs (); /// visit constant virtual int visit_constant (be_constant *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_context.h b/TAO/TAO_IDL/be_include/be_visitor_context.h index 0951b14fbda..4fe7d901355 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_context.h +++ b/TAO/TAO_IDL/be_include/be_visitor_context.h @@ -40,13 +40,13 @@ class be_visitor_context : public ast_visitor_context { public: /// default constructor - be_visitor_context (void); + be_visitor_context (); /// default constructor be_visitor_context (const be_visitor_context &ctx); /// destructor - ~be_visitor_context (void); + ~be_visitor_context (); /// assignment operator be_visitor_context &operator= (const be_visitor_context &ctx); @@ -54,67 +54,67 @@ public: // =helpers /// reset the context - void reset (void); + void reset (); /// set the output stream void stream (TAO_OutStream *os); /// get the stream - TAO_OutStream *stream (void); + TAO_OutStream *stream (); /// set the scope void scope (be_scope *scope); /// get the scope in which code will be generated - be_scope *scope (void); + be_scope *scope (); /// current node being visited void node (be_decl *node); /// node being visited - be_decl *node (void); + be_decl *node (); /// code generation state void state (TAO_CodeGen::CG_STATE); /// return the code generation state - TAO_CodeGen::CG_STATE state (void); + TAO_CodeGen::CG_STATE state (); /// code generation state void sub_state (TAO_CodeGen::CG_SUB_STATE); /// return the code generation state - TAO_CodeGen::CG_SUB_STATE sub_state (void); + TAO_CodeGen::CG_SUB_STATE sub_state (); /// set the alias node (if any) void alias (be_typedef *node); /// return the aliased node (if any) - be_typedef *alias (void); + be_typedef *alias (); /// set the typedef node (if any) void tdef (be_typedef *node); /// return the typedef node (if any) - be_typedef *tdef (void); + be_typedef *tdef (); /// set the attribute node if any void attribute (be_attribute *attr); /// get the attribute node - be_attribute *attribute (void); + be_attribute *attribute (); /// is it the special ctor for exceptions? void exception (bool); /// is it the special ctor for exceptions? - bool exception (void); + bool exception (); /// scope supoorts generation of comma after each element void comma (bool); /// are we supposed to generate a comma? - bool comma (void); + bool comma (); /** * In some cases we need to generate the objects of one interface as @@ -123,17 +123,17 @@ public: * *generating* code, as opposed to the interfaces where the methods * or structures are defined. */ - be_interface *interface (void) const; + be_interface *interface () const; void interface (be_interface *); /// Accessor for the member. - ACE_CString &port_prefix (void); + ACE_CString &port_prefix (); /// return the export macro currently in force - const char *export_macro (void) const; + const char *export_macro () const; /// if anyop export macro is empty, check stub. - const char *non_null_export_macro (void) const; + const char *non_null_export_macro () const; private: /// code generation state diff --git a/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h b/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h index ca41373b041..03184b0fb39 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_dds_ts_idl.h @@ -29,7 +29,7 @@ class be_visitor_dds_ts_idl : public be_visitor_scope public: be_visitor_dds_ts_idl (be_visitor_context *ctx); - ~be_visitor_dds_ts_idl (void); + ~be_visitor_dds_ts_idl (); virtual int visit_root (be_root *node); virtual int visit_module (be_module *node); @@ -46,8 +46,8 @@ private: void gen_datareader (be_type *node); /// Manage streams and files. - int init_file (void); - void fini_file (void); + int init_file (); + void fini_file (); private: TAO_OutStream *os_ptr_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_decl.h b/TAO/TAO_IDL/be_include/be_visitor_decl.h index 266e0376fae..cde8ecb37ef 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_decl.h @@ -29,9 +29,9 @@ class be_visitor_decl : public be_visitor public: be_visitor_decl (be_visitor_context *ctx); - ~be_visitor_decl (void); + ~be_visitor_decl (); - be_visitor_context *ctx (void); + be_visitor_context *ctx (); protected: /// Any context information required by the visitor. diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h index 610382298d1..a5d46ffa8a7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_enum_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_enum_any_op_ch (void); + ~be_visitor_enum_any_op_ch (); /// visit enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h index 7f813cbfb5b..4fd3d8f6e4b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/any_op_cs.h @@ -30,7 +30,7 @@ public: be_visitor_enum_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_enum_any_op_cs (void); + ~be_visitor_enum_any_op_cs (); /// visit enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h index bc2240a1b91..07e4f1b9609 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_enum_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_enum_cdr_op_ch (void); + ~be_visitor_enum_cdr_op_ch (); /// visit enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h index adcba1de635..c7a39686789 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/cdr_op_cs.h @@ -30,7 +30,7 @@ public: be_visitor_enum_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_enum_cdr_op_cs (void); + ~be_visitor_enum_cdr_op_cs (); /// visit enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h index e353754e3d1..c1514b5f712 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_ch.h @@ -28,7 +28,7 @@ public: be_visitor_enum_ch (be_visitor_context *ctx); /// deenumor - ~be_visitor_enum_ch (void); + ~be_visitor_enum_ch (); /// visit enum. virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h index d77ed23332b..dcb06a90627 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_enum/enum_cs.h @@ -28,7 +28,7 @@ public: be_visitor_enum_cs (be_visitor_context *ctx); /// deenumor - ~be_visitor_enum_cs (void); + ~be_visitor_enum_cs (); /// visit enum and generate the typecode virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h index 262455138f7..e49da61f6f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_ch.h @@ -27,7 +27,7 @@ class be_visitor_exception_any_op_ch : public be_visitor_scope public: be_visitor_exception_any_op_ch (be_visitor_context *ctx); - ~be_visitor_exception_any_op_ch (void); + ~be_visitor_exception_any_op_ch (); virtual int visit_exception (be_exception *node); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h index d188a3115e5..4a252adef3d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/any_op_cs.h @@ -27,7 +27,7 @@ class be_visitor_exception_any_op_cs : public be_visitor_scope public: be_visitor_exception_any_op_cs (be_visitor_context *ctx); - ~be_visitor_exception_any_op_cs (void); + ~be_visitor_exception_any_op_cs (); virtual int visit_exception (be_exception *node); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h index d8b357042af..462beb7214b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_ch.h @@ -28,7 +28,7 @@ class be_visitor_exception_cdr_op_ch : public be_visitor_exception public: be_visitor_exception_cdr_op_ch (be_visitor_context *ctx); - ~be_visitor_exception_cdr_op_ch (void); + ~be_visitor_exception_cdr_op_ch (); virtual int visit_exception (be_exception *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h index b579bf99e2d..ed86886f347 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/cdr_op_cs.h @@ -28,7 +28,7 @@ class be_visitor_exception_cdr_op_cs : public be_visitor_exception public: be_visitor_exception_cdr_op_cs (be_visitor_context *ctx); - ~be_visitor_exception_cdr_op_cs (void); + ~be_visitor_exception_cdr_op_cs (); virtual int visit_exception (be_exception *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h index ea9600d63d0..e7f10cd0346 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor.h @@ -24,7 +24,7 @@ class be_visitor_exception_ctor : public be_visitor_scope { public: be_visitor_exception_ctor (be_visitor_context *ctx); - ~be_visitor_exception_ctor (void); + ~be_visitor_exception_ctor (); virtual int post_process (be_decl *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h index 53c633473d6..17e7f4914a4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/ctor_assign.h @@ -24,7 +24,7 @@ class be_visitor_exception_ctor_assign : public be_visitor_scope { public: be_visitor_exception_ctor_assign (be_visitor_context *ctx); - ~be_visitor_exception_ctor_assign (void); + ~be_visitor_exception_ctor_assign (); virtual int visit_exception (be_exception *node); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h index ee30eaa1aba..22c13ddfa7b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception.h @@ -25,7 +25,7 @@ class be_visitor_exception : public be_visitor_scope { public: be_visitor_exception (be_visitor_context *ctx); - ~be_visitor_exception (void); + ~be_visitor_exception (); virtual int visit_exception (be_exception *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h index 5bda48fbaec..063bb0a90ee 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ch.h @@ -25,7 +25,7 @@ class be_visitor_exception_ch : public be_visitor_exception { public: be_visitor_exception_ch (be_visitor_context *ctx); - ~be_visitor_exception_ch (void); + ~be_visitor_exception_ch (); virtual int visit_exception (be_exception *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h index b73dfa93fff..a07e9017cd3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_ci.h @@ -25,7 +25,7 @@ class be_visitor_exception_ci : public be_visitor_exception { public: be_visitor_exception_ci (be_visitor_context *ctx); - ~be_visitor_exception_ci (void); + ~be_visitor_exception_ci (); virtual int visit_exception (be_exception *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h index 3bd79bb082f..97a5b221517 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_exception/exception_cs.h @@ -25,7 +25,7 @@ class be_visitor_exception_cs : public be_visitor_exception { public: be_visitor_exception_cs (be_visitor_context *ctx); - ~be_visitor_exception_cs (void); + ~be_visitor_exception_cs (); virtual int visit_exception (be_exception *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h index edcfb760650..04fb0dc86fe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_ch.h @@ -25,7 +25,7 @@ class be_visitor_field_cdr_op_ch : public be_visitor_decl { public: be_visitor_field_cdr_op_ch (be_visitor_context *ctx); - ~be_visitor_field_cdr_op_ch (void); + ~be_visitor_field_cdr_op_ch (); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h index 37a6ffd93eb..ee844d8c9dd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/cdr_op_cs.h @@ -24,7 +24,7 @@ class be_visitor_field_cdr_op_cs : public be_visitor_decl { public: be_visitor_field_cdr_op_cs (be_visitor_context *ctx); - ~be_visitor_field_cdr_op_cs (void); + ~be_visitor_field_cdr_op_cs (); /// visit the field node virtual int visit_field (be_field *node); @@ -52,7 +52,7 @@ public: virtual int visit_union_fwd (be_union_fwd *node); private: - int emit_valuetype_common (void); + int emit_valuetype_common (); }; /** diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h index 3078353f8a9..2145b282203 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ch.h @@ -24,7 +24,7 @@ class be_visitor_field_ch : public be_visitor_decl { public: be_visitor_field_ch (be_visitor_context *ctx); - ~be_visitor_field_ch (void); + ~be_visitor_field_ch (); virtual int visit_field (be_field *node); virtual int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h index a32d5d3b165..dd22e9f1682 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_ci.h @@ -25,7 +25,7 @@ class be_visitor_field_ci : public be_visitor_decl { public: be_visitor_field_ci (be_visitor_context *ctx); - ~be_visitor_field_ci (void); + ~be_visitor_field_ci (); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h index 4c3768040dd..533b0a28dcd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_field/field_cs.h @@ -25,7 +25,7 @@ class be_visitor_field_cs : public be_visitor_decl { public: be_visitor_field_cs (be_visitor_context *ctx); - ~be_visitor_field_cs (void); + ~be_visitor_field_cs (); virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h index 67793591bf4..cf49e324489 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_ex_idl.h @@ -27,7 +27,7 @@ class be_visitor_home_ex_idl : public be_visitor_scope public: be_visitor_home_ex_idl (be_visitor_context *ctx); - ~be_visitor_home_ex_idl (void); + ~be_visitor_home_ex_idl (); virtual int visit_home (be_home *node); @@ -42,24 +42,24 @@ public: virtual int visit_string (be_string *node); private: - void gen_implicit (void); - void gen_explicit (void); - void gen_derived (void); + void gen_implicit (); + void gen_explicit (); + void gen_derived (); - void gen_supported (void); + void gen_supported (); void gen_exception_list (UTL_ExceptList *exceptions, const char *prefix = "", bool init_op = false); - void gen_home_executor (void); + void gen_home_executor (); /// The CCM preproc visitor changed the scoped name and the /// defined_in() for the home's members to the implied /// *Explicit interface, which isn't a problem unless /// they include exceptions raised by a contained operation. /// factory or finder. So we restore the members just in case. - void restore_scope (void); + void restore_scope (); private: be_home *node_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h index e5d1f190b25..4ac2060e25f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exh.h @@ -27,7 +27,7 @@ class be_visitor_home_exh : public be_visitor_scope public: be_visitor_home_exh (be_visitor_context *ctx); - ~be_visitor_home_exh (void); + ~be_visitor_home_exh (); virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); @@ -41,9 +41,9 @@ public: TAO_OutStream *); private: - int gen_exec_class (void); + int gen_exec_class (); - void gen_entrypoint (void); + void gen_entrypoint (); private: be_home *node_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h index 5dd74ec96e7..a5bc812e282 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_exs.h @@ -27,7 +27,7 @@ class be_visitor_home_exs : public be_visitor_scope public: be_visitor_home_exs (be_visitor_context *ctx); - ~be_visitor_home_exs (void); + ~be_visitor_home_exs (); virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); @@ -35,9 +35,9 @@ public: virtual int visit_factory (be_factory *node); private: - int gen_exec_class (void); + int gen_exec_class (); - void gen_entrypoint (void); + void gen_entrypoint (); private: be_home *node_; diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h index 2bedc2de3bc..4feaa55bdc1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svh.h @@ -26,7 +26,7 @@ class be_visitor_home_svh : public be_visitor_scope public: be_visitor_home_svh (be_visitor_context *ctx); - ~be_visitor_home_svh (void); + ~be_visitor_home_svh (); virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); @@ -35,9 +35,9 @@ public: virtual int visit_finder (be_finder *node); private: - int gen_servant_class (void); + int gen_servant_class (); - void gen_entrypoint (void); + void gen_entrypoint (); /// Helper method passed to traverse_inheritance_graph(), /// collects supported operations and attributes. diff --git a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h index 8709485991d..8da752963f6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_home/home_svs.h @@ -26,7 +26,7 @@ class be_visitor_home_svs : public be_visitor_scope public: be_visitor_home_svs (be_visitor_context *ctx); - ~be_visitor_home_svs (void); + ~be_visitor_home_svs (); virtual int visit_home (be_home *node); virtual int visit_operation (be_operation *node); @@ -36,9 +36,9 @@ public: virtual int visit_finder (be_finder *node); private: - int gen_servant_class (void); + int gen_servant_class (); - void gen_entrypoint (void); + void gen_entrypoint (); private: be_home *node_; @@ -69,7 +69,7 @@ class be_visitor_home_attr_set : public be_visitor_decl public: be_visitor_home_attr_set (be_visitor_context *ctx); - ~be_visitor_home_attr_set (void); + ~be_visitor_home_attr_set (); virtual int visit_home (be_home *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h index 3571db50638..6fbaa310ad3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ch.h @@ -30,7 +30,7 @@ public: be_visitor_amh_interface_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_amh_interface_ch (void); + ~be_visitor_amh_interface_ch (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h index 49a7b0b011a..f0b65056463 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_sh.h @@ -15,11 +15,11 @@ class be_visitor_amh_rh_interface_sh : public be_visitor_interface_sh { public: - be_visitor_amh_rh_interface_sh (void); + be_visitor_amh_rh_interface_sh (); be_visitor_amh_rh_interface_sh (be_visitor_context *ctx); - ~be_visitor_amh_rh_interface_sh (void); + ~be_visitor_amh_rh_interface_sh (); virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h index efb6bfe1e69..bdb2fe50e54 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_rh_ss.h @@ -22,7 +22,7 @@ public: int visit_operation (be_operation *node); - ~be_visitor_amh_rh_interface_ss (void); + ~be_visitor_amh_rh_interface_ss (); }; #endif /* AMH_RH_INTERFACE_SS_H */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h index 733c8f1de0d..9af9fd2202c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_sh.h @@ -15,7 +15,7 @@ class be_visitor_amh_interface_sh : public be_visitor_interface_sh { public: be_visitor_amh_interface_sh (be_visitor_context *ctx); - ~be_visitor_amh_interface_sh (void); + ~be_visitor_amh_interface_sh (); int visit_interface (be_interface *node); int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h index 238db0bb5b6..c0b9beac332 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/amh_ss.h @@ -23,7 +23,7 @@ public: int visit_operation (be_operation *node); int visit_attribute (be_attribute *node); - ~be_visitor_amh_interface_ss (void); + ~be_visitor_amh_interface_ss (); protected: virtual void this_method (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h index db2bb9bde6e..a7a2d9fe2c5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_conn_ex_idl.h @@ -26,7 +26,7 @@ class be_visitor_ami4ccm_conn_ex_idl : public be_visitor_scope public: be_visitor_ami4ccm_conn_ex_idl (be_visitor_context *ctx); - ~be_visitor_ami4ccm_conn_ex_idl (void); + ~be_visitor_ami4ccm_conn_ex_idl (); virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h index c3a7693c802..636e9e73e88 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_rh_ex_idl.h @@ -26,7 +26,7 @@ class be_visitor_ami4ccm_rh_ex_idl : public be_visitor_scope public: be_visitor_ami4ccm_rh_ex_idl (be_visitor_context *ctx); - ~be_visitor_ami4ccm_rh_ex_idl (void); + ~be_visitor_ami4ccm_rh_ex_idl (); virtual int visit_interface (be_interface *node); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h index ccc9102d7a2..b26192722ba 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/ami4ccm_sendc_ex_idl.h @@ -26,7 +26,7 @@ class be_visitor_ami4ccm_sendc_ex_idl : public be_visitor_scope public: be_visitor_ami4ccm_sendc_ex_idl (be_visitor_context *ctx); - ~be_visitor_ami4ccm_sendc_ex_idl (void); + ~be_visitor_ami4ccm_sendc_ex_idl (); virtual int visit_interface (be_interface *node); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h index cf1eee4b14a..14423fd2e60 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_ch.h @@ -26,7 +26,7 @@ class be_visitor_interface_any_op_ch : public be_visitor_interface public: be_visitor_interface_any_op_ch (be_visitor_context *ctx); - ~be_visitor_interface_any_op_ch (void); + ~be_visitor_interface_any_op_ch (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h index 7409ce3a65d..47ba221489f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/any_op_cs.h @@ -26,7 +26,7 @@ class be_visitor_interface_any_op_cs : public be_visitor_interface public: be_visitor_interface_any_op_cs (be_visitor_context *ctx); - ~be_visitor_interface_any_op_cs (void); + ~be_visitor_interface_any_op_cs (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h index 00a49c87100..478b6d191f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_ch.h @@ -28,7 +28,7 @@ class be_visitor_interface_cdr_op_ch : public be_visitor_interface public: be_visitor_interface_cdr_op_ch (be_visitor_context *ctx); - ~be_visitor_interface_cdr_op_ch (void); + ~be_visitor_interface_cdr_op_ch (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h index e95dd50c04a..79f212abee7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/cdr_op_cs.h @@ -28,7 +28,7 @@ class be_visitor_interface_cdr_op_cs : public be_visitor_interface public: be_visitor_interface_cdr_op_cs (be_visitor_context *ctx); - ~be_visitor_interface_cdr_op_cs (void); + ~be_visitor_interface_cdr_op_cs (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h index 6f8ab960b6b..1b10d9ab9d4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_sh.h @@ -27,7 +27,7 @@ public: // -- Ctor/Dtor Decl. -- be_visitor_interface_direct_proxy_impl_sh (be_visitor_context *ctx); - virtual ~be_visitor_interface_direct_proxy_impl_sh (void); + virtual ~be_visitor_interface_direct_proxy_impl_sh (); /// visit an interface virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h index 1d298c1a2e5..cf818e8a44b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/direct_proxy_impl_ss.h @@ -26,7 +26,7 @@ public: // -- Ctor/Dtor Decl. -- be_visitor_interface_direct_proxy_impl_ss (be_visitor_context *ctx); - virtual ~be_visitor_interface_direct_proxy_impl_ss (void); + virtual ~be_visitor_interface_direct_proxy_impl_ss (); /// visit an interface virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h index 679951ebead..b3f0d0ae183 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svth.h @@ -27,7 +27,7 @@ class be_visitor_facet_svth : public be_visitor_interface public: be_visitor_facet_svth (be_visitor_context *ctx); - ~be_visitor_facet_svth (void); + ~be_visitor_facet_svth (); virtual int visit_interface (be_interface *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h index 7e8f26614d6..4fe718c369c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/facet_svts.h @@ -27,7 +27,7 @@ class be_visitor_facet_svts : public be_visitor_interface public: be_visitor_facet_svts (be_visitor_context *ctx); - ~be_visitor_facet_svts (void); + ~be_visitor_facet_svts (); virtual int visit_interface (be_interface *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h index 86e324fd121..00587d6fd9a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface.h @@ -45,7 +45,7 @@ class be_visitor_interface : public be_visitor_scope { public: be_visitor_interface (be_visitor_context *ctx); - ~be_visitor_interface (void); + ~be_visitor_interface (); virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h index 8a6b8323cea..a6d0bf77c9d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ch.h @@ -27,7 +27,7 @@ class be_visitor_interface_ch : public be_visitor_interface { public: be_visitor_interface_ch (be_visitor_context *ctx); - ~be_visitor_interface_ch (void); + ~be_visitor_interface_ch (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h index 41b274c36ce..375a538c424 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ci.h @@ -24,7 +24,7 @@ class be_visitor_interface_ci : public be_visitor_interface { public: be_visitor_interface_ci (be_visitor_context *ctx); - ~be_visitor_interface_ci (void); + ~be_visitor_interface_ci (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h index b3830240020..c78de386e5e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_cs.h @@ -24,7 +24,7 @@ class be_visitor_interface_cs : public be_visitor_interface { public: be_visitor_interface_cs (be_visitor_context *ctx); - ~be_visitor_interface_cs (void); + ~be_visitor_interface_cs (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h index 6f6983ae890..b72b4f957d2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ex_idl.h @@ -28,7 +28,7 @@ class be_visitor_interface_ex_idl : public be_visitor_interface public: be_visitor_interface_ex_idl (be_visitor_context *ctx); - ~be_visitor_interface_ex_idl (void); + ~be_visitor_interface_ex_idl (); virtual int visit_interface (be_interface *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h index d88faa13f2e..8b861ab6198 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ih.h @@ -29,7 +29,7 @@ public: be_visitor_interface_ih (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_ih (void); + ~be_visitor_interface_ih (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h index d4a54bd4945..85d6e612542 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_is.h @@ -28,7 +28,7 @@ public: be_visitor_interface_is (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_is (void); + ~be_visitor_interface_is (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h index 9cded98fca5..2ef902215e7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_sh.h @@ -24,7 +24,7 @@ class be_visitor_interface_sh : public be_visitor_interface { public: be_visitor_interface_sh (be_visitor_context *ctx); - ~be_visitor_interface_sh (void); + ~be_visitor_interface_sh (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h index a859d496e89..d5caf5496ff 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_ss.h @@ -27,7 +27,7 @@ class be_visitor_interface_ss : public be_visitor_interface { public: be_visitor_interface_ss (be_visitor_context *ctx); - ~be_visitor_interface_ss (void); + ~be_visitor_interface_ss (); virtual int visit_interface (be_interface *node); virtual int visit_component (be_component *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h index 28e95dc4ca6..b62e1ebd3d4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svth.h @@ -28,7 +28,7 @@ class be_visitor_interface_svth : public be_visitor_interface public: be_visitor_interface_svth (be_visitor_context *ctx); - ~be_visitor_interface_svth (void); + ~be_visitor_interface_svth (); virtual int visit_interface (be_interface *node); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h index d4dd4ea012c..16a5d734390 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/interface_svts.h @@ -28,7 +28,7 @@ class be_visitor_interface_svts : public be_visitor_interface public: be_visitor_interface_svts (be_visitor_context *ctx); - ~be_visitor_interface_svts (void); + ~be_visitor_interface_svts (); virtual int visit_interface (be_interface *node); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h index f5f553ba0d4..dd15ff9eb80 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_ch.h @@ -28,7 +28,7 @@ public: be_visitor_interface_smart_proxy_ch (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_interface_smart_proxy_ch (void); + virtual ~be_visitor_interface_smart_proxy_ch (); /// visit an interface virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h index 61ee835793d..d407b35f477 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/smart_proxy_cs.h @@ -27,7 +27,7 @@ public: be_visitor_interface_smart_proxy_cs (be_visitor_context *ctx); /// destructor - virtual ~be_visitor_interface_smart_proxy_cs (void); + virtual ~be_visitor_interface_smart_proxy_cs (); /// visit interface virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h index a9e1162a554..159874fa2c2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_sh.h @@ -28,7 +28,7 @@ public: be_visitor_interface_tie_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_tie_sh (void); + ~be_visitor_interface_tie_sh (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h index 40c11251da1..f5055a655d6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface/tie_ss.h @@ -29,7 +29,7 @@ public: be_visitor_interface_tie_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_tie_ss (void); + ~be_visitor_interface_tie_ss (); /// set the right context and make a visitor virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h index a0f374c208e..65986f49535 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_interface_fwd_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_fwd_any_op_ch (void); + ~be_visitor_interface_fwd_any_op_ch (); /// visit interface_fwd virtual int visit_interface_fwd (be_interface_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h index eda0f278a6a..950f3d6914e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_interface_fwd_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_fwd_cdr_op_ch (void); + ~be_visitor_interface_fwd_cdr_op_ch (); /// visit forward declared interface virtual int visit_interface_fwd (be_interface_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h index f40ecff308d..33aff8865c0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_interface_fwd/interface_fwd_ch.h @@ -28,7 +28,7 @@ public: be_visitor_interface_fwd_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_interface_fwd_ch (void); + ~be_visitor_interface_fwd_ch (); /// visit interface_fwd. virtual int visit_interface_fwd (be_interface_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h b/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h index 12835445a5a..45b2ea985fe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_member_type_decl.h @@ -28,7 +28,7 @@ class be_visitor_member_type_decl : public be_visitor_decl { public: be_visitor_member_type_decl (be_visitor_context *ctx); - virtual ~be_visitor_member_type_decl (void); + virtual ~be_visitor_member_type_decl (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h index 1ed876190fc..e18ae92a0f8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/any_op.h @@ -32,7 +32,7 @@ public: be_visitor_module_any_op (be_visitor_context *ctx); /// destructor - ~be_visitor_module_any_op (void); + ~be_visitor_module_any_op (); /// visit module virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h index 31913a72908..c78e389a3b2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/cdr_op.h @@ -32,7 +32,7 @@ public: be_visitor_module_cdr_op (be_visitor_context *ctx); /// destructor - ~be_visitor_module_cdr_op (void); + ~be_visitor_module_cdr_op (); /// visit module virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module.h b/TAO/TAO_IDL/be_include/be_visitor_module/module.h index edaebc17183..64c12a08c6d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module.h @@ -28,7 +28,7 @@ class be_visitor_module : public be_visitor_scope public: be_visitor_module (be_visitor_context *ctx); - ~be_visitor_module (void); + ~be_visitor_module (); virtual int visit_constant (be_constant *node); virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h index 74e4ed0243f..8fca169d567 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ch.h @@ -29,7 +29,7 @@ public: be_visitor_module_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_module_ch (void); + ~be_visitor_module_ch (); /// visit module. We provide code for this method in the derived class virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h index e6ce39f1690..afa981dab01 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_ih.h @@ -30,7 +30,7 @@ public: be_visitor_module_ih (be_visitor_context *ctx); /// destructor - ~be_visitor_module_ih (void); + ~be_visitor_module_ih (); /// visit module. We provide code for this method in the derived class virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h index d6fa27007f7..1598f322820 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_module/module_sh.h @@ -29,7 +29,7 @@ public: be_visitor_module_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_module_sh (void); + ~be_visitor_module_sh (); /// visit module. We provide code for this method in the derived class virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h b/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h index 9dd04c79fd0..3e2e37c3562 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_native/native_ch.h @@ -28,7 +28,7 @@ public: be_visitor_native_ch (be_visitor_context *ctx); /// deenumor - ~be_visitor_native_ch (void); + ~be_visitor_native_ch (); /// visit native. virtual int visit_native (be_native *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h index cdc71d47ccc..bc8322ceea4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h +++ b/TAO/TAO_IDL/be_include/be_visitor_null_return_value.h @@ -30,7 +30,7 @@ class be_visitor_null_return_value : public be_visitor_decl { public: be_visitor_null_return_value (be_visitor_context *ctx); - virtual ~be_visitor_null_return_value (void); + virtual ~be_visitor_null_return_value (); virtual int visit_array (be_array *); virtual int visit_component (be_component *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h index 8c6cd8d2999..a3bb7bd730d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_sh.h @@ -25,7 +25,7 @@ class be_visitor_amh_rh_operation_sh : public be_visitor_operation public: be_visitor_amh_rh_operation_sh (be_visitor_context *ctx); - ~be_visitor_amh_rh_operation_sh (void); + ~be_visitor_amh_rh_operation_sh (); int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h index 1beb3814d9d..059e5ca2f3b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_rh_ss.h @@ -25,7 +25,7 @@ class be_visitor_amh_rh_operation_ss : public be_visitor_operation public: be_visitor_amh_rh_operation_ss (be_visitor_context *ctx); - ~be_visitor_amh_rh_operation_ss (void); + ~be_visitor_amh_rh_operation_ss (); int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h index 31a72611e45..966574ab1f9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_sh.h @@ -21,7 +21,7 @@ class be_visitor_amh_operation_sh : public be_visitor_operation { public: be_visitor_amh_operation_sh (be_visitor_context *ctx); - ~be_visitor_amh_operation_sh (void); + ~be_visitor_amh_operation_sh (); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h index 82024d5b74f..fa8dc6b614d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/amh_ss.h @@ -22,7 +22,7 @@ class be_visitor_amh_operation_ss : public be_visitor_operation public: be_visitor_amh_operation_ss (be_visitor_context *ctx); - ~be_visitor_amh_operation_ss (void); + ~be_visitor_amh_operation_ss (); virtual int visit_operation (be_operation *node); virtual int visit_attribute (be_attribute *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h index bc30ee7fce3..64a1b557ce5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_cs.h @@ -31,7 +31,7 @@ public: be_visitor_operation_ami_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ami_cs (void); + ~be_visitor_operation_ami_cs (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h index 9f598031e3e..b222f25eec9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/ami_handler_reply_stub_operation_cs.h @@ -33,7 +33,7 @@ public: be_visitor_operation_ami_handler_reply_stub_operation_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ami_handler_reply_stub_operation_cs (void); + ~be_visitor_operation_ami_handler_reply_stub_operation_cs (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h index ef1721f9765..a95c034822a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/arglist.h @@ -30,7 +30,7 @@ class be_visitor_operation_arglist : public be_visitor_operation public: be_visitor_operation_arglist (be_visitor_context *ctx); - ~be_visitor_operation_arglist (void); + ~be_visitor_operation_arglist (); virtual int visit_operation (be_operation *node); virtual int visit_factory (be_factory *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h index ea31a1aaf4e..6ddf98cfad4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument.h @@ -33,7 +33,7 @@ public: be_visitor_operation_argument (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_argument (void); + ~be_visitor_operation_argument (); /// stuff to o/p after each element of the scope is handled virtual int post_process (be_decl *); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h index 4828c66a4b1..46c5f0334d9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_invoke.h @@ -35,7 +35,7 @@ public: be_visitor_operation_argument_invoke (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_argument_invoke (void); + ~be_visitor_operation_argument_invoke (); /// stuff to o/p before each element of the scope is handled virtual int pre_process (be_decl *bd); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h index 7e26cff6ce6..b0441621613 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/argument_marshal.h @@ -31,7 +31,7 @@ public: be_visitor_operation_argument_marshal (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_argument_marshal (void); + ~be_visitor_operation_argument_marshal (); /// stuff to o/p before each element of the scope is handled virtual int pre_process (be_decl *bd); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h index ce17f859cc0..8a4a37e743b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/direct_proxy_impl_ss.h @@ -28,7 +28,7 @@ public: be_visitor_operation_direct_proxy_impl_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_direct_proxy_impl_ss (void); + ~be_visitor_operation_direct_proxy_impl_ss (); /// visit operation node. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h index c2f52642839..c2ef44f481f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_cs.h @@ -33,7 +33,7 @@ public: be_visitor_operation_exceptlist_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_exceptlist_cs (void); + ~be_visitor_operation_exceptlist_cs (); /// visit the operation int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h index 5052fd237f3..09a5a3eeb52 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/exceptlist_ss.h @@ -36,7 +36,7 @@ public: be_visitor_operation_exceptlist_ss (be_visitor_context * ctx); /// destructor - ~be_visitor_operation_exceptlist_ss (void); + ~be_visitor_operation_exceptlist_ss (); /// visit the operation int visit_operation (be_operation * node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h index a69ca530064..b41e2adfe36 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation.h @@ -32,7 +32,7 @@ public: be_visitor_operation (be_visitor_context *ctx); /// destructor - ~be_visitor_operation (void); + ~be_visitor_operation (); // =helper diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h index 3fd32942e60..79620cd71b6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ch.h @@ -31,7 +31,7 @@ public: be_visitor_operation_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ch (void); + ~be_visitor_operation_ch (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h index 67fb65ef842..843fc3c11b4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_cs.h @@ -31,7 +31,7 @@ public: be_visitor_operation_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_cs (void); + ~be_visitor_operation_cs (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h index 1a6e95c51bb..8d89781c20d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_exs.h @@ -30,7 +30,7 @@ class be_visitor_operation_exs : public be_visitor_scope public: be_visitor_operation_exs (be_visitor_context *ctx); - ~be_visitor_operation_exs (void); + ~be_visitor_operation_exs (); virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h index 752a4fd774a..11b4cd84301 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ih.h @@ -31,7 +31,7 @@ public: be_visitor_operation_ih (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ih (void); + ~be_visitor_operation_ih (); /// visit operation. We provide code for this method in the derived class virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h index 870fcd1bb81..b03de3f23b4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_is.h @@ -31,7 +31,7 @@ public: be_visitor_operation_is (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_is (void); + ~be_visitor_operation_is (); /// visit operation. We provide code for this method in the derived class virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h index 7841f3a9066..2a081ad3c90 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_sh.h @@ -31,7 +31,7 @@ public: be_visitor_operation_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_sh (void); + ~be_visitor_operation_sh (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h index e12a2a59669..80b971a25d0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_ss.h @@ -32,7 +32,7 @@ public: be_visitor_operation_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_ss (void); + ~be_visitor_operation_ss (); /// visit operation. We provide code for this method in the derived class virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h index 391bcfdf7d2..f739aaa5cc5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/operation_svs.h @@ -31,7 +31,7 @@ class be_visitor_operation_svs : public be_visitor_scope public: be_visitor_operation_svs (be_visitor_context *ctx); - ~be_visitor_operation_svs (void); + ~be_visitor_operation_svs (); virtual int visit_operation (be_operation *node); virtual int visit_argument (be_argument *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h index fd0555d206d..4c64e341371 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/proxy_impl_xh.h @@ -28,7 +28,7 @@ public: be_visitor_operation_proxy_impl_xh (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_proxy_impl_xh (void); + ~be_visitor_operation_proxy_impl_xh (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h index 92138e2f332..e63c7c48cea 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype.h @@ -32,7 +32,7 @@ public: be_visitor_operation_rettype (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_rettype (void); + ~be_visitor_operation_rettype (); /// visit an array node int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h index 9462881b33c..25f367e66cb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/rettype_return_cs.h @@ -33,7 +33,7 @@ public: be_visitor_operation_rettype_return_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_rettype_return_cs (void); + ~be_visitor_operation_rettype_return_cs (); /// visit an array node int visit_array (be_array *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h index 7111c0d3a56..5967764955f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_ch.h @@ -33,7 +33,7 @@ public: be_visitor_operation_smart_proxy_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_smart_proxy_ch (void); + ~be_visitor_operation_smart_proxy_ch (); /// visit operation node. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h index ae9032ad443..040bd528088 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/smart_proxy_cs.h @@ -30,7 +30,7 @@ public: be_visitor_operation_smart_proxy_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_smart_proxy_cs (void); + ~be_visitor_operation_smart_proxy_cs (); /// visit operation. virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h index a843454511b..d850c05d9eb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_sh.h @@ -32,7 +32,7 @@ public: be_visitor_operation_tie_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_tie_sh (void); + ~be_visitor_operation_tie_sh (); /// set the right context and make a visitor virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h index ad8831d311e..21c8b5e315d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/tie_ss.h @@ -31,7 +31,7 @@ public: be_visitor_operation_tie_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_operation_tie_ss (void); + ~be_visitor_operation_tie_ss (); /// set the right context and make a visitor virtual int visit_operation (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h index 10d6e7306ae..b35c5df1a10 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_operation/upcall_command_ss.h @@ -23,7 +23,7 @@ public: be_visitor_operation_upcall_command_ss (be_visitor_context * ctx); /// destructor - ~be_visitor_operation_upcall_command_ss (void); + ~be_visitor_operation_upcall_command_ss (); /// Same as visit_operation() but override full_skel_name and /// upcall_command_name. diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h index 31647f6923a..1012aec6909 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/any_op.h @@ -28,7 +28,7 @@ class be_visitor_root_any_op : public be_visitor_root public: be_visitor_root_any_op (be_visitor_context *ctx); - ~be_visitor_root_any_op (void); + ~be_visitor_root_any_op (); virtual int visit_root (be_root *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h index 7dc9c68f544..646d97abc3f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/cdr_op.h @@ -28,7 +28,7 @@ class be_visitor_root_cdr_op : public be_visitor_root public: be_visitor_root_cdr_op (be_visitor_context *ctx); - ~be_visitor_root_cdr_op (void); + ~be_visitor_root_cdr_op (); virtual int visit_root (be_root *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root.h b/TAO/TAO_IDL/be_include/be_visitor_root/root.h index cee348218ef..3322d73e1e3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root.h @@ -27,7 +27,7 @@ class be_visitor_root : public be_visitor_module public: be_visitor_root (be_visitor_context *ctx); - ~be_visitor_root (void); + ~be_visitor_root (); /// This is the only method that differs from that of the /// be_visitor_module bass class. diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h index 501646291bc..3cf7f0ee1de 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ch.h @@ -28,21 +28,21 @@ class be_visitor_root_ch : public be_visitor_root public: be_visitor_root_ch (be_visitor_context *ctx); - ~be_visitor_root_ch (void); + ~be_visitor_root_ch (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); /// Encapsulating various bits of code generation peculiar /// to the client header file, done either before or after /// the main scope traversal. int gen_arg_traits (be_root *node); - void gen_fwd_decls (void); - void gen_ref_counting_overrides (void); - void gen_static_corba_overrides (void); + void gen_fwd_decls (); + void gen_ref_counting_overrides (); + void gen_static_corba_overrides (); int gen_obv_decls (be_root *node); int gen_object_traits (be_root *node); int gen_template_exports (be_root *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h index d27a02b264c..7522d4f48a2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ci.h @@ -28,13 +28,13 @@ class be_visitor_root_ci : public be_visitor_root public: be_visitor_root_ci (be_visitor_context *ctx); - ~be_visitor_root_ci (void); + ~be_visitor_root_ci (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); /// Generate OBV definitions in the client inline /// file, done after the main scope traversal. diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h index e3934f27152..0861de99d08 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cnh.h @@ -28,13 +28,13 @@ class be_visitor_root_cnh : public be_visitor_root public: be_visitor_root_cnh (be_visitor_context *ctx); - ~be_visitor_root_cnh (void); + ~be_visitor_root_cnh (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_CNH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h index aba97d8ca8d..0624821cd89 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cns.h @@ -28,12 +28,12 @@ class be_visitor_root_cns : public be_visitor_root public: be_visitor_root_cns (be_visitor_context *ctx); - ~be_visitor_root_cns (void); + ~be_visitor_root_cns (); virtual int visit_root (be_root *node); /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_CNS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h index 7b1d425ab19..46d255a924e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_cs.h @@ -28,13 +28,13 @@ class be_visitor_root_cs : public be_visitor_root public: be_visitor_root_cs (be_visitor_context *ctx); - ~be_visitor_root_cs (void); + ~be_visitor_root_cs (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); /// Encapsulating various bits of code generation peculiar /// to the client source file, done either before or after diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h index 9f48060c23b..854795b07df 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ex_idl.h @@ -28,13 +28,13 @@ class be_visitor_root_ex_idl : public be_visitor_root public: be_visitor_root_ex_idl (be_visitor_context *ctx); - ~be_visitor_root_ex_idl (void); + ~be_visitor_root_ex_idl (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_EX_IDL_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h index f265526a375..c2fb5fcf70e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exh.h @@ -28,13 +28,13 @@ class be_visitor_root_exh : public be_visitor_root public: be_visitor_root_exh (be_visitor_context *ctx); - ~be_visitor_root_exh (void); + ~be_visitor_root_exh (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_EXH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h index 10a24929673..4172a031627 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_exs.h @@ -28,13 +28,13 @@ class be_visitor_root_exs : public be_visitor_root public: be_visitor_root_exs (be_visitor_context *ctx); - ~be_visitor_root_exs (void); + ~be_visitor_root_exs (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_EXS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h index 7af2ca6939f..d8a37fa55bb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ih.h @@ -26,13 +26,13 @@ class be_visitor_root_ih : public be_visitor_root public: be_visitor_root_ih (be_visitor_context *ctx); - ~be_visitor_root_ih (void); + ~be_visitor_root_ih (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_IH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h index 1228c06cea4..c41805268fc 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_is.h @@ -26,13 +26,13 @@ class be_visitor_root_is : public be_visitor_root public: be_visitor_root_is (be_visitor_context *ctx); - ~be_visitor_root_is (void); + ~be_visitor_root_is (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_IS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h index eb69d3f11cb..db27baf64c1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sh.h @@ -27,13 +27,13 @@ class be_visitor_root_sh : public be_visitor_root public: be_visitor_root_sh (be_visitor_context *ctx); - ~be_visitor_root_sh (void); + ~be_visitor_root_sh (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); /// Generate arg template trait specializations in /// the skeleton header file, done before the main diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h index f8ba08c106e..28d4c19288f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_ss.h @@ -27,13 +27,13 @@ class be_visitor_root_ss : public be_visitor_root public: be_visitor_root_ss (be_visitor_context *ctx); - ~be_visitor_root_ss (void); + ~be_visitor_root_ss (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h index 2884d9459e9..7b22bac8e50 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_sth.h @@ -28,7 +28,7 @@ class be_visitor_root_sth : public be_visitor_root public: be_visitor_root_sth (be_visitor_context *ctx); - ~be_visitor_root_sth (void); + ~be_visitor_root_sth (); virtual int visit_root (be_root *node); @@ -40,7 +40,7 @@ public: private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_STH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h index 8d1a21e2e96..1e56d0acec9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svh.h @@ -28,13 +28,13 @@ class be_visitor_root_svh : public be_visitor_root public: be_visitor_root_svh (be_visitor_context *ctx); - ~be_visitor_root_svh (void); + ~be_visitor_root_svh (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SVH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h index 6d8202b0c5d..d9baf73eded 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svs.h @@ -28,13 +28,13 @@ class be_visitor_root_svs : public be_visitor_root public: be_visitor_root_svs (be_visitor_context *ctx); - ~be_visitor_root_svs (void); + ~be_visitor_root_svs (); virtual int visit_root (be_root *node); private: /// Set the right context and make a visitor. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SVS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h index 59abaf33ff5..9d557cb3c22 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svth.h @@ -28,13 +28,13 @@ class be_visitor_root_svth : public be_visitor_root public: be_visitor_root_svth (be_visitor_context *ctx); - ~be_visitor_root_svth (void); + ~be_visitor_root_svth (); virtual int visit_root (be_root *node); private: /// Open file and initialize stream. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SVTH_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h index 4b669c2118e..9dd2151e95e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h +++ b/TAO/TAO_IDL/be_include/be_visitor_root/root_svts.h @@ -28,13 +28,13 @@ class be_visitor_root_svts : public be_visitor_root public: be_visitor_root_svts (be_visitor_context *ctx); - ~be_visitor_root_svts (void); + ~be_visitor_root_svts (); virtual int visit_root (be_root *node); private: /// Set the right context and make a visitor. - int init (void); + int init (); }; #endif /* _BE_VISITOR_ROOT_ROOT_SVTS_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_scope.h b/TAO/TAO_IDL/be_include/be_visitor_scope.h index 7c3b819b27b..2d6bce24001 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_scope.h +++ b/TAO/TAO_IDL/be_include/be_visitor_scope.h @@ -31,7 +31,7 @@ public: be_visitor_scope (be_visitor_context *ctx); /// destructor - ~be_visitor_scope (void); + ~be_visitor_scope (); /// visit scope int visit_scope (be_scope *node); @@ -44,7 +44,7 @@ public: virtual int pre_process (be_decl *); /// return the element number that is being processed - virtual int elem_number (void); + virtual int elem_number (); /// get the successor to elem virtual int next_elem (be_decl *elem, be_decl *&); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h index 4cc76d38678..c1df47e39d3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_sequence_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_any_op_ch (void); + ~be_visitor_sequence_any_op_ch (); /// visit sequence virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h index b96fa97cadb..916eaea173b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/any_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_sequence_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_any_op_cs (void); + ~be_visitor_sequence_any_op_cs (); /// visit sequence virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h index 10249ffc920..e43be03ecb5 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/buffer_type.h @@ -31,7 +31,7 @@ public: be_visitor_sequence_buffer_type (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_buffer_type (void); + ~be_visitor_sequence_buffer_type (); // = Visitor methods. virtual int visit_predefined_type (be_predefined_type *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h index adec609812e..7d6ee5e5b29 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_sequence_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_cdr_op_ch (void); + ~be_visitor_sequence_cdr_op_ch (); /// visit sequence virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h index 261e6a92479..530d6f85398 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/cdr_op_cs.h @@ -34,7 +34,7 @@ public: be_visitor_sequence_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_cdr_op_cs (void); + ~be_visitor_sequence_cdr_op_cs (); /// visit sequence virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h index 3b6df9024ec..47313216b25 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_base.h @@ -36,7 +36,7 @@ public: be_visitor_sequence_base (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_base (void); + ~be_visitor_sequence_base (); // = Visitor methods. virtual int visit_predefined_type (be_predefined_type *node); @@ -80,7 +80,7 @@ public: be_sequence *node ); ///Dtor - ~be_visitor_sequence_base_template_args (void); + ~be_visitor_sequence_base_template_args (); //= Visit methods virtual int visit_interface (be_interface *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h index 7c110967ce2..e4b106f3858 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_ch.h @@ -31,7 +31,7 @@ public: be_visitor_sequence_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_ch (void); + ~be_visitor_sequence_ch (); /// visit sequence node. virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h index c4b85929655..d6a6ba09009 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_sequence/sequence_cs.h @@ -32,7 +32,7 @@ public: be_visitor_sequence_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_sequence_cs (void); + ~be_visitor_sequence_cs (); /// visit sequence node virtual int visit_sequence (be_sequence *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h index ee0e57fdd13..c7d3270ab32 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_structure_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_any_op_ch (void); + ~be_visitor_structure_any_op_ch (); /// visit structure virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h index 8a007981986..72d670410f6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/any_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_structure_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_any_op_cs (void); + ~be_visitor_structure_any_op_cs (); /// visit structure virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h index 3b93c14968b..a5d002c62e4 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_structure_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_cdr_op_ch (void); + ~be_visitor_structure_cdr_op_ch (); /// visit structure virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h index 5b84cf62295..f307404d16a 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/cdr_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_structure_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_cdr_op_cs (void); + ~be_visitor_structure_cdr_op_cs (); /// visit structure virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h index 70054836d98..afc9cffa36e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure.h @@ -29,7 +29,7 @@ public: be_visitor_structure (be_visitor_context *ctx); /// destructureor - ~be_visitor_structure (void); + ~be_visitor_structure (); /// visit structure. We provide code for this method in the derived class virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h index 69f68c18def..bd08ad67e00 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ch.h @@ -29,7 +29,7 @@ public: be_visitor_structure_ch (be_visitor_context *ctx); /// destructureor - ~be_visitor_structure_ch (void); + ~be_visitor_structure_ch (); /// visit structure. We provide code for this method in the derived class virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h index d3a9cd4e9b2..b31296115ab 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_ci.h @@ -29,7 +29,7 @@ public: be_visitor_structure_ci (be_visitor_context *ctx); /// destructureor - ~be_visitor_structure_ci (void); + ~be_visitor_structure_ci (); /// visit structure. We provide code for this method in the derived class virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h index 27238db835d..bc37fa3e55b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure/structure_cs.h @@ -29,7 +29,7 @@ public: be_visitor_structure_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_structure_cs (void); + ~be_visitor_structure_cs (); /// visit structure. virtual int visit_structure (be_structure *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h index c01c8b17417..8325735282f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_structure_fwd/structure_fwd_ch.h @@ -25,7 +25,7 @@ class be_visitor_structure_fwd_ch : public be_visitor_decl public: be_visitor_structure_fwd_ch (be_visitor_context *ctx); - ~be_visitor_structure_fwd_ch (void); + ~be_visitor_structure_fwd_ch (); virtual int visit_structure_fwd (be_structure_fwd *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_template_export.h b/TAO/TAO_IDL/be_include/be_visitor_template_export.h index 6283dcf7382..a77fdd98b12 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_template_export.h +++ b/TAO/TAO_IDL/be_include/be_visitor_template_export.h @@ -34,7 +34,7 @@ class be_visitor_template_export : public be_visitor_scope public: be_visitor_template_export (be_visitor_context *ctx); - virtual ~be_visitor_template_export (void); + virtual ~be_visitor_template_export (); virtual int visit_root (be_root *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_traits.h b/TAO/TAO_IDL/be_include/be_visitor_traits.h index a5d1b3f4094..accc2411db1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_traits.h +++ b/TAO/TAO_IDL/be_include/be_visitor_traits.h @@ -25,7 +25,7 @@ class be_visitor_traits : public be_visitor_scope public: be_visitor_traits (be_visitor_context *ctx); - virtual ~be_visitor_traits (void); + virtual ~be_visitor_traits (); virtual int visit_root (be_root *node); virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h index a50ef718edf..6f6ae5b285b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_decl.h @@ -26,7 +26,7 @@ class be_visitor_typecode_decl : public be_visitor_decl public: be_visitor_typecode_decl (be_visitor_context *ctx); - ~be_visitor_typecode_decl (void); + ~be_visitor_typecode_decl (); /// visit a generic be_type node. virtual int visit_type (be_type *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h index b2f551067ad..242f3b0c74e 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typecode/typecode_defn.h @@ -35,7 +35,7 @@ class be_visitor_typecode_defn : public be_visitor_scope { public: be_visitor_typecode_defn (be_visitor_context *ctx); - ~be_visitor_typecode_defn (void); + ~be_visitor_typecode_defn (); virtual int visit_array (be_array *node); virtual int visit_interface (be_interface *node); @@ -95,8 +95,8 @@ protected: * Utility methods to generate enclosing namespaces for * typecodes of bounded (w)strings, sequences and arrays. */ - void gen_begin_NS_for_anon (void); - void gen_end_NS_for_anon (void); + void gen_begin_NS_for_anon (); + void gen_end_NS_for_anon (); protected: diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h index d56e828a938..b56dc448931 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_ch.h @@ -33,7 +33,7 @@ public: be_visitor_typedef_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_any_op_ch (void); + ~be_visitor_typedef_any_op_ch (); /// visit typedef virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h index b9893f50635..aa4b7381f82 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/any_op_cs.h @@ -33,7 +33,7 @@ public: be_visitor_typedef_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_any_op_cs (void); + ~be_visitor_typedef_any_op_cs (); /// visit typedef virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h index 08db072de62..087b3da6db2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_typedef_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_cdr_op_ch (void); + ~be_visitor_typedef_cdr_op_ch (); /// visit typedef virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h index 1c782481af2..10fc1214464 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/cdr_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_typedef_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_cdr_op_cs (void); + ~be_visitor_typedef_cdr_op_cs (); /// visit typedef virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h index 2de5434f6c0..d287c2a4061 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef.h @@ -30,7 +30,7 @@ public: be_visitor_typedef (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef (void); + ~be_visitor_typedef (); /// must be overridden virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h index ad27eb3dd52..8e88c8a599c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ch.h @@ -30,7 +30,7 @@ public: be_visitor_typedef_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_ch (void); + ~be_visitor_typedef_ch (); /// visit typedef. We provide code for this method in the derived class virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h index 849f1ba2cbe..4580a68e7a0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_ci.h @@ -30,7 +30,7 @@ public: be_visitor_typedef_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_ci (void); + ~be_visitor_typedef_ci (); /// visit typedef. We provide code for this method in the derived class virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h index ae814c4ff69..83afa8278fd 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_typedef/typedef_cs.h @@ -30,7 +30,7 @@ public: be_visitor_typedef_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_typedef_cs (void); + ~be_visitor_typedef_cs (); /// visit typedef. We provide code for this method in the derived class virtual int visit_typedef (be_typedef *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h index ff66c35eb52..3426539cbde 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_ch.h @@ -30,7 +30,7 @@ class be_visitor_union_any_op_ch : public be_visitor_union public: be_visitor_union_any_op_ch (be_visitor_context *ctx); - ~be_visitor_union_any_op_ch (void); + ~be_visitor_union_any_op_ch (); virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h index 7c8bd1f0757..c8983f61874 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/any_op_cs.h @@ -30,7 +30,7 @@ class be_visitor_union_any_op_cs : public be_visitor_union public: be_visitor_union_any_op_cs (be_visitor_context *ctx); - ~be_visitor_union_any_op_cs (void); + ~be_visitor_union_any_op_cs (); virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h index f3a4c952259..1ce2eca9e79 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_ch.h @@ -32,7 +32,7 @@ public: be_visitor_union_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_union_cdr_op_ch (void); + ~be_visitor_union_cdr_op_ch (); /// visit union virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h index 9ce9d00c75e..ecfbe0ef1a7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/cdr_op_cs.h @@ -32,7 +32,7 @@ public: be_visitor_union_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_union_cdr_op_cs (void); + ~be_visitor_union_cdr_op_cs (); /// visit union virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h index 26a1c20e3ac..4264f931d36 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ch.h @@ -31,7 +31,7 @@ public: be_visitor_union_discriminant_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_union_discriminant_ch (void); + ~be_visitor_union_discriminant_ch (); /// visit an enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h index 4397b39bfa5..eeb7f291462 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_ci.h @@ -31,7 +31,7 @@ public: be_visitor_union_discriminant_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_union_discriminant_ci (void); + ~be_visitor_union_discriminant_ci (); /// visit an enum virtual int visit_enum (be_enum *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h index 3391c92ed24..037f3e95ada 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/discriminant_cs.h @@ -31,7 +31,7 @@ public: be_visitor_union_discriminant_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_union_discriminant_cs (void); + ~be_visitor_union_discriminant_cs (); /// visit an enum. Required to generate the typecode for an enum definition /// appearing side the union diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union.h b/TAO/TAO_IDL/be_include/be_visitor_union/union.h index c854e6e2e73..390655bc5f3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union.h @@ -29,7 +29,7 @@ public: be_visitor_union (be_visitor_context *ctx); /// destructor - ~be_visitor_union (void); + ~be_visitor_union (); /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h index 13cb7108fb3..a70a7905448 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ch.h @@ -29,7 +29,7 @@ public: be_visitor_union_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_union_ch (void); + ~be_visitor_union_ch (); /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h index 2ec0e177681..c94dda604c1 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_ci.h @@ -29,7 +29,7 @@ public: be_visitor_union_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_union_ci (void); + ~be_visitor_union_ci (); /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h index 1ef3e1056dc..e7de0e48a79 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union/union_cs.h @@ -29,7 +29,7 @@ public: be_visitor_union_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_union_cs (void); + ~be_visitor_union_cs (); /// visit union. We provide code for this method in the derived class virtual int visit_union (be_union *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h index cedb2782d5a..af566f93483 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_ch.h @@ -28,7 +28,7 @@ public: be_visitor_union_branch_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_union_branch_cdr_op_ch (void); + ~be_visitor_union_branch_cdr_op_ch (); /// visit the union_branch node virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h index 20aa8847d06..6834916b463 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/cdr_op_cs.h @@ -28,7 +28,7 @@ public: be_visitor_union_branch_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_union_branch_cdr_op_cs (void); + ~be_visitor_union_branch_cdr_op_cs (); /// visit the union_branch node virtual int visit_union_branch (be_union_branch *node); @@ -50,7 +50,7 @@ public: virtual int visit_union (be_union *node); /// extra code generation for an explicit default case - virtual int explicit_default (void); + virtual int explicit_default (); private: int emit_valuetype_common (be_type *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h index 85845146063..b2a2272f31d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/private_ch.h @@ -28,7 +28,7 @@ class be_visitor_union_branch_private_ch : public be_visitor_decl { public: be_visitor_union_branch_private_ch (be_visitor_context *ctx); - ~be_visitor_union_branch_private_ch (void); + ~be_visitor_union_branch_private_ch (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h index 79d3801b9f2..4159df97ac9 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_assign_cs.h @@ -28,7 +28,7 @@ class be_visitor_union_branch_public_assign_cs { public: be_visitor_union_branch_public_assign_cs (be_visitor_context *ctx); - ~be_visitor_union_branch_public_assign_cs (void); + ~be_visitor_union_branch_public_assign_cs (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h index 9cbd194ff40..c8d55b282e0 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ch.h @@ -29,7 +29,7 @@ class be_visitor_union_branch_public_ch : public be_visitor_decl { public: be_visitor_union_branch_public_ch (be_visitor_context *ctx); - ~be_visitor_union_branch_public_ch (void); + ~be_visitor_union_branch_public_ch (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h index 496c5c2e748..4667b8f4801 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_ci.h @@ -27,7 +27,7 @@ class be_visitor_union_branch_public_ci : public be_visitor_decl { public: be_visitor_union_branch_public_ci (be_visitor_context *ctx); - ~be_visitor_union_branch_public_ci (void); + ~be_visitor_union_branch_public_ci (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h index c30d1d0955a..2490a42ea32 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_constructor_cs.h @@ -25,7 +25,7 @@ class be_visitor_union_branch_public_constructor_cs : public be_visitor_decl { public: be_visitor_union_branch_public_constructor_cs (be_visitor_context *ctx); - ~be_visitor_union_branch_public_constructor_cs (void); + ~be_visitor_union_branch_public_constructor_cs (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h index 99fa4686efa..805d29f620c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_cs.h @@ -28,7 +28,7 @@ class be_visitor_union_branch_public_cs : public be_visitor_decl { public: be_visitor_union_branch_public_cs (be_visitor_context *ctx); - ~be_visitor_union_branch_public_cs (void); + ~be_visitor_union_branch_public_cs (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h index 64cea01a6f5..763de71c464 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_branch/public_reset_cs.h @@ -27,7 +27,7 @@ class be_visitor_union_branch_public_reset_cs : public be_visitor_decl { public: be_visitor_union_branch_public_reset_cs (be_visitor_context *ctx); - ~be_visitor_union_branch_public_reset_cs (void); + ~be_visitor_union_branch_public_reset_cs (); virtual int visit_union_branch (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h index 2d68892a6d2..96c3e7a7f5c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_union_fwd/union_fwd_ch.h @@ -25,7 +25,7 @@ class be_visitor_union_fwd_ch : public be_visitor_decl public: be_visitor_union_fwd_ch (be_visitor_context *ctx); - ~be_visitor_union_fwd_ch (void); + ~be_visitor_union_fwd_ch (); virtual int visit_union_fwd (be_union_fwd *node); }; diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h index 23bf51ed796..080cc5ae17b 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_valuebox_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_any_op_ch (void); + ~be_visitor_valuebox_any_op_ch (); /// visit valuebox virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h index f218e2a22ad..cd90d608340 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/any_op_cs.h @@ -30,7 +30,7 @@ public: be_visitor_valuebox_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_any_op_cs (void); + ~be_visitor_valuebox_any_op_cs (); /// visit valuebox virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h index aec6458437e..8b0036312bb 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_ch.h @@ -31,7 +31,7 @@ public: be_visitor_valuebox_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_cdr_op_ch (void); + ~be_visitor_valuebox_cdr_op_ch (); /// visit valuebox virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h index c3b5a917306..37bf0fadb88 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/cdr_op_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuebox_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_cdr_op_cs (void); + ~be_visitor_valuebox_cdr_op_cs (); /// visit valuebox virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h index 38b0b3b0b31..34fefe71189 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ch.h @@ -36,7 +36,7 @@ public: be_visitor_valuebox_field_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_field_ch (void); + ~be_visitor_valuebox_field_ch (); /// visit the union_branch node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h index d4670541979..809f453fbd7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/field_ci.h @@ -31,7 +31,7 @@ public: be_visitor_valuebox_field_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_field_ci (void); + ~be_visitor_valuebox_field_ci (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h index fab13fc5d84..896e8b55351 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/union_member_ci.h @@ -31,7 +31,7 @@ public: be_visitor_valuebox_union_member_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_union_member_ci (void); + ~be_visitor_valuebox_union_member_ci (); /// visit the field node virtual int visit_union_member (be_union_branch *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h index b3709563f2f..1b2323c35fa 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox.h @@ -28,7 +28,7 @@ public: be_visitor_valuebox (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox (void); + ~be_visitor_valuebox (); /// visit attribute. We provide code for this method in the derived class virtual int visit_valuebox (be_valuebox *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h index 118a9668d65..a51de1e2bf3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ch.h @@ -29,7 +29,7 @@ public: be_visitor_valuebox_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_ch (void); + ~be_visitor_valuebox_ch (); /// visit valuebox. virtual int visit_valuebox (be_valuebox *node); @@ -66,14 +66,14 @@ private: const char * type_suffix, bool is_any); - void emit_default_constructor (void); + void emit_default_constructor (); void emit_constructor_one_arg (be_decl *node, const char * type_suffix, const char * const_prefix, const char * ref_modifier); - void emit_copy_constructor (void); + void emit_copy_constructor (); void emit_assignment (be_decl *node, const char * type_suffix, diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h index 49dfaa4068d..9648cd6d43f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_ci.h @@ -29,7 +29,7 @@ public: be_visitor_valuebox_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_ci (void); + ~be_visitor_valuebox_ci (); /// visit valuebox. virtual int visit_valuebox (be_valuebox *node); @@ -66,7 +66,7 @@ private: const char * type_suffix, bool is_any); - void emit_default_constructor (void); + void emit_default_constructor (); void emit_default_constructor_alloc (be_decl *node); @@ -75,7 +75,7 @@ private: void emit_constructor_one_arg_alloc (be_decl *node); - void emit_copy_constructor (void); + void emit_copy_constructor (); void emit_copy_constructor_alloc (be_decl *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h index e796c1609f9..04f7d3c99f7 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuebox/valuebox_cs.h @@ -29,7 +29,7 @@ public: be_visitor_valuebox_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuebox_cs (void); + ~be_visitor_valuebox_cs (); /// visit valuebox. virtual int visit_valuebox (be_valuebox *node); @@ -64,7 +64,7 @@ public: private: /// Generate virtual destructor. - void emit_destructor (void); + void emit_destructor (); int emit_for_predef_enum (char const * marshal_arg); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h index f5cc50396c7..8e3bb6945de 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_any_op_ch (void); + ~be_visitor_valuetype_any_op_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h index 93f11d5405e..59592143bf3 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/any_op_cs.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_any_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_any_op_cs (void); + ~be_visitor_valuetype_any_op_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h index d2e366c65ab..72e09aa5740 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/arglist.h @@ -30,7 +30,7 @@ public: be_visitor_obv_operation_arglist (be_visitor_context *ctx); /// destructor - ~be_visitor_obv_operation_arglist (void); + ~be_visitor_obv_operation_arglist (); /// special arglist generation for amh_exceptionholders bool is_amh_exception_holder (be_operation *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h index c4348820b8b..524ff9818ce 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_ch.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_cdr_op_ch (void); + ~be_visitor_valuetype_cdr_op_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h index dfa3e35af76..8edf6514674 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/cdr_op_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_cdr_op_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_cdr_op_cs (void); + ~be_visitor_valuetype_cdr_op_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h index ad2c3f30bb8..a3f1302dac6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_ch.h @@ -29,7 +29,7 @@ public: be_visitor_valuetype_field_cdr_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_cdr_ch (void); + ~be_visitor_valuetype_field_cdr_ch (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h index 1af6277b317..c85bb564e38 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cdr_cs.h @@ -29,7 +29,7 @@ public: be_visitor_valuetype_field_cdr_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_cdr_cs (void); + ~be_visitor_valuetype_field_cdr_cs (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h index 1d84862b461..cfe51a9af28 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ch.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_field_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_ch (void); + ~be_visitor_valuetype_field_ch (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h index 6a8153cac77..461bd00d1b8 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_ci.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_field_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_ci (void); + ~be_visitor_valuetype_field_ci (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h index 856acd77c00..4680215ca15 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/field_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_field_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_field_cs (void); + ~be_visitor_valuetype_field_cs (); /// visit the field node virtual int visit_field (be_field *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h index 4908c95737e..4363664d7db 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_ch.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_marshal_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_marshal_ch (void); + ~be_visitor_valuetype_marshal_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h index c6024fa7087..8e23ed10fbe 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/marshal_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_marshal_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_marshal_cs (void); + ~be_visitor_valuetype_marshal_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h index b25cce5d72f..60bbde6b4e2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/obv_module.h @@ -31,7 +31,7 @@ public: be_visitor_obv_module (be_visitor_context *ctx); /// destructor - ~be_visitor_obv_module (void); + ~be_visitor_obv_module (); virtual int visit_module (be_module *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h index 6e5e5677ac8..fe09e70ad43 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype.h @@ -32,7 +32,7 @@ public: be_visitor_valuetype (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype (void); + ~be_visitor_valuetype (); public: /// visit the scope of the valuetype node diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h index 8affb65795e..290ea60d68d 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ch.h @@ -32,7 +32,7 @@ public: be_visitor_valuetype_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_ch (void); + ~be_visitor_valuetype_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); @@ -40,8 +40,8 @@ public: virtual int visit_operation (be_operation *node); virtual int visit_field (be_field *node); - void begin_public (void); - void begin_private (void); + void begin_public (); + void begin_private (); /// Helper method passed to the template method to generate code for /// the operations of the parents of supported interfaces. diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h index a0c02219945..47f4bd861b6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ci.h @@ -28,7 +28,7 @@ public: be_visitor_valuetype_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_ci (void); + ~be_visitor_valuetype_ci (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h index df723ab6b93..44e785a5013 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_cs.h @@ -26,7 +26,7 @@ class be_visitor_valuetype_cs : public be_visitor_valuetype public: be_visitor_valuetype_cs (be_visitor_context *ctx); - ~be_visitor_valuetype_cs (void); + ~be_visitor_valuetype_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h index fae38511a86..9157b6c534c 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init.h @@ -30,12 +30,12 @@ public: be_visitor_valuetype_init (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init (void); + ~be_visitor_valuetype_init (); public: - void begin_public (void); - void begin_private (void); + void begin_public (); + void begin_private (); }; #endif /* _BE_VALUETYPE_VALUETYPE_INIT_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h index b9fc5cd7511..2aea1d11f76 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_arglist_ch.h @@ -29,7 +29,7 @@ public: be_visitor_valuetype_init_arglist_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init_arglist_ch (void); + ~be_visitor_valuetype_init_arglist_ch (); /// visit factory construct virtual int visit_factory (be_factory *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h index 2d0ad7cff51..74c73677e06 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ch.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_init_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init_ch (void); + ~be_visitor_valuetype_init_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h index 93860a85d62..29c2cff6601 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_ci.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_init_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init_ci (void); + ~be_visitor_valuetype_init_ci (); }; #endif /* _BE_VALUETYPE_VALUETYPE_INIT_CI_H_ */ diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h index fdc1e72a47b..674284dda70 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_init_cs.h @@ -31,7 +31,7 @@ public: be_visitor_valuetype_init_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_init_cs (void); + ~be_visitor_valuetype_init_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h index 19b66bd1533..5fa1dd5cce6 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ch.h @@ -34,7 +34,7 @@ public: be_visitor_valuetype_obv_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_obv_ch (void); + ~be_visitor_valuetype_obv_ch (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h index fcd6bb5dbc7..232a30cb445 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_ci.h @@ -34,7 +34,7 @@ public: be_visitor_valuetype_obv_ci (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_obv_ci (void); + ~be_visitor_valuetype_obv_ci (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h index 29e984c2758..f05ac4cd831 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_obv_cs.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_obv_cs (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_obv_cs (void); + ~be_visitor_valuetype_obv_cs (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h index a51a01244fc..fb1d2e30603 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_sh.h @@ -28,7 +28,7 @@ public: be_visitor_valuetype_sh (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_sh (void); + ~be_visitor_valuetype_sh (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h index 0c844fae670..b28f0f8f191 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype/valuetype_ss.h @@ -29,7 +29,7 @@ public: be_visitor_valuetype_ss (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_ss (void); + ~be_visitor_valuetype_ss (); virtual int visit_valuetype (be_valuetype *node); virtual int visit_eventtype (be_eventtype *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h index 4df1ecf1d02..1bb2b44360f 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/any_op_ch.h @@ -30,7 +30,7 @@ public: be_visitor_valuetype_fwd_any_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_fwd_any_op_ch (void); + ~be_visitor_valuetype_fwd_any_op_ch (); virtual int visit_valuetype_fwd (be_valuetype_fwd *node); virtual int visit_eventtype_fwd (be_eventtype_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h index 8835cc726de..0a3761bf5f2 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/cdr_op_ch.h @@ -33,7 +33,7 @@ public: be_visitor_valuetype_fwd_cdr_op_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_fwd_cdr_op_ch (void); + ~be_visitor_valuetype_fwd_cdr_op_ch (); virtual int visit_valuetype_fwd (be_valuetype_fwd *node); virtual int visit_eventtype_fwd (be_eventtype_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h index b19b47a1eb2..1b86d70af06 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h +++ b/TAO/TAO_IDL/be_include/be_visitor_valuetype_fwd/valuetype_fwd_ch.h @@ -28,7 +28,7 @@ public: be_visitor_valuetype_fwd_ch (be_visitor_context *ctx); /// destructor - ~be_visitor_valuetype_fwd_ch (void); + ~be_visitor_valuetype_fwd_ch (); virtual int visit_valuetype_fwd (be_valuetype_fwd *node); virtual int visit_eventtype_fwd (be_eventtype_fwd *node); diff --git a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h index 0bcf140d4e8..4050b455279 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h +++ b/TAO/TAO_IDL/be_include/be_visitor_xplicit_pre_proc.h @@ -28,7 +28,7 @@ class be_visitor_xplicit_pre_proc : public be_visitor_ccm_pre_proc public: be_visitor_xplicit_pre_proc (be_visitor_context *ctx); - virtual ~be_visitor_xplicit_pre_proc (void); + virtual ~be_visitor_xplicit_pre_proc (); virtual int visit_home (be_home *node); @@ -61,7 +61,7 @@ public: virtual int visit_predefined_type (be_predefined_type *node); // Member accessor - be_interface *xplicit (void) const; + be_interface *xplicit () const; private: void check_and_store (AST_Decl *node); diff --git a/TAO/TAO_IDL/fe/idl.tab.hpp b/TAO/TAO_IDL/fe/idl.tab.hpp index fbe1e9b75cc..354e713e626 100644 --- a/TAO/TAO_IDL/fe/idl.tab.hpp +++ b/TAO/TAO_IDL/fe/idl.tab.hpp @@ -203,6 +203,6 @@ typedef union YYSTYPE YYSTYPE; extern YYSTYPE tao_yylval; -int tao_yyparse (void); +int tao_yyparse (); #endif /* !YY_TAO_YY_FE_IDL_TAB_HPP_INCLUDED */ diff --git a/TAO/TAO_IDL/include/ast_argument.h b/TAO/TAO_IDL/include/ast_argument.h index 1666dd12548..6f90a060c00 100644 --- a/TAO/TAO_IDL/include/ast_argument.h +++ b/TAO/TAO_IDL/include/ast_argument.h @@ -87,10 +87,10 @@ public: AST_Type *ft, UTL_ScopedName *n); - virtual ~AST_Argument (void); + virtual ~AST_Argument (); // Data Accessors. - Direction direction (void); + Direction direction (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -99,7 +99,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_array.h b/TAO/TAO_IDL/include/ast_array.h index 6fac7521260..7ea8b6521ed 100644 --- a/TAO/TAO_IDL/include/ast_array.h +++ b/TAO/TAO_IDL/include/ast_array.h @@ -87,26 +87,26 @@ public: bool local, bool abstract); - virtual ~AST_Array (void); + virtual ~AST_Array (); // Data Accessors. - ACE_CDR::ULong n_dims (void); + ACE_CDR::ULong n_dims (); - AST_Expression **dims (void); + AST_Expression **dims (); void set_dims (AST_Expression **, ACE_CDR::ULong); - AST_Type *base_type (void) const; + AST_Type *base_type () const; void set_base_type (AST_Type *nbt); // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Cleanup. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -125,7 +125,7 @@ public: ///} protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. private: diff --git a/TAO/TAO_IDL/include/ast_attribute.h b/TAO/TAO_IDL/include/ast_attribute.h index e1d813fd9cf..b8be84250cc 100644 --- a/TAO/TAO_IDL/include/ast_attribute.h +++ b/TAO/TAO_IDL/include/ast_attribute.h @@ -81,13 +81,13 @@ public: bool local, bool abstract); - virtual ~AST_Attribute (void); + virtual ~AST_Attribute (); // Data Accessors. - bool readonly (void) const; - UTL_ExceptList *get_get_exceptions (void) const; - UTL_ExceptList *get_set_exceptions (void) const; + bool readonly () const; + UTL_ExceptList *get_get_exceptions () const; + UTL_ExceptList *get_set_exceptions () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -96,7 +96,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); // Methods to add exceptions directly, used when copying node. UTL_ExceptList *be_add_get_exceptions (UTL_ExceptList *t); @@ -119,7 +119,7 @@ private: // Scope Management Protocol. - friend int tao_yyparse (void); + friend int tao_yyparse (); virtual UTL_NameList *fe_add_get_exceptions (UTL_NameList *e); virtual UTL_NameList *fe_add_set_exceptions (UTL_NameList *e); }; diff --git a/TAO/TAO_IDL/include/ast_component.h b/TAO/TAO_IDL/include/ast_component.h index fe962cab9ac..7d45a7b455b 100644 --- a/TAO/TAO_IDL/include/ast_component.h +++ b/TAO/TAO_IDL/include/ast_component.h @@ -24,7 +24,7 @@ public: AST_Interface **supports_flat, long n_supports_flat); - virtual ~AST_Component (void); + virtual ~AST_Component (); // This also calls the base class version. virtual void redefine (AST_Interface *from); @@ -39,11 +39,11 @@ public: // Accessors. - AST_Component *base_component (void) const; + AST_Component *base_component () const; - AST_Type **supports (void) const; + AST_Type **supports () const; - long n_supports (void) const; + long n_supports () const; // Override for component of UTL_Scope method. virtual AST_Decl *special_lookup (UTL_ScopedName *e, @@ -51,7 +51,7 @@ public: AST_Decl *&final_parent_decl); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Allows adding an uses to a later point // The port i is inserted after port ix, if diff --git a/TAO/TAO_IDL/include/ast_component_fwd.h b/TAO/TAO_IDL/include/ast_component_fwd.h index 528b1da6753..61b721beff6 100644 --- a/TAO/TAO_IDL/include/ast_component_fwd.h +++ b/TAO/TAO_IDL/include/ast_component_fwd.h @@ -12,10 +12,10 @@ public: AST_ComponentFwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~AST_ComponentFwd (void); + virtual ~AST_ComponentFwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Is this decl a forward declared type (Yes) - virtual bool is_fwd (void); + virtual bool is_fwd (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_concrete_type.h b/TAO/TAO_IDL/include/ast_concrete_type.h index 79caca0859a..3d15bc1ba7b 100644 --- a/TAO/TAO_IDL/include/ast_concrete_type.h +++ b/TAO/TAO_IDL/include/ast_concrete_type.h @@ -77,10 +77,10 @@ public: AST_ConcreteType (AST_Decl::NodeType nt, UTL_ScopedName *n); - virtual ~AST_ConcreteType (void); + virtual ~AST_ConcreteType (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); virtual bool annotatable () const { return true; } }; diff --git a/TAO/TAO_IDL/include/ast_connector.h b/TAO/TAO_IDL/include/ast_connector.h index 54d08ce7e26..d1748e5853e 100644 --- a/TAO/TAO_IDL/include/ast_connector.h +++ b/TAO/TAO_IDL/include/ast_connector.h @@ -9,17 +9,17 @@ class TAO_IDL_FE_Export AST_Connector : public virtual AST_Component { public: - AST_Connector (void); + AST_Connector (); AST_Connector (UTL_ScopedName *n, AST_Connector *base_connector); - virtual ~AST_Connector (void); + virtual ~AST_Connector (); - AST_Connector *base_connector (void) const; + AST_Connector *base_connector () const; // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_constant.h b/TAO/TAO_IDL/include/ast_constant.h index f0961ab11be..b974e63a842 100644 --- a/TAO/TAO_IDL/include/ast_constant.h +++ b/TAO/TAO_IDL/include/ast_constant.h @@ -92,23 +92,23 @@ public: AST_Expression *ev, UTL_ScopedName *n); - virtual ~AST_Constant (void); + virtual ~AST_Constant (); // Data Accessors. - AST_Expression *constant_value (void); - AST_Expression::ExprType et (void); + AST_Expression *constant_value (); + AST_Expression::ExprType et (); // Accessors for the private member. - bool ifr_added (void); + bool ifr_added (); void ifr_added (bool val); - const char *exprtype_to_string (void); + const char *exprtype_to_string (); // Returns the appropriate type. static const char *exprtype_to_string (AST_Expression::ExprType et); // For use with ORBs without the CORBA namespace. - UTL_ScopedName *enum_full_name (void); + UTL_ScopedName *enum_full_name (); // If our type is enum, we have to generate the scoped name. // AST Dumping. @@ -118,7 +118,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_consumes.h b/TAO/TAO_IDL/include/ast_consumes.h index 22c84fc62e3..9060876b5c3 100644 --- a/TAO/TAO_IDL/include/ast_consumes.h +++ b/TAO/TAO_IDL/include/ast_consumes.h @@ -12,10 +12,10 @@ public: AST_Consumes (UTL_ScopedName *n, AST_Type *consumes_type); - virtual ~AST_Consumes (void); + virtual ~AST_Consumes (); // Data Accessor. - AST_Type *consumes_type (void) const; + AST_Type *consumes_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_decl.h b/TAO/TAO_IDL/include/ast_decl.h index a617dc4023b..c018be50aba 100644 --- a/TAO/TAO_IDL/include/ast_decl.h +++ b/TAO/TAO_IDL/include/ast_decl.h @@ -93,17 +93,17 @@ protected: COMMON_Base (bool local = false, bool abstract = false); - virtual ~COMMON_Base (void); + virtual ~COMMON_Base (); public: // A no-op, overridden in the child classes. - virtual void destroy (void); + virtual void destroy (); // Accessor needs to get overridden for a few types. - virtual bool is_local (void); + virtual bool is_local (); void is_local (bool val); - bool is_abstract (void) const; + bool is_abstract () const; void is_abstract (bool val); protected: @@ -195,10 +195,10 @@ public: UTL_ScopedName *name, AST_Decl *other); - virtual ~AST_Decl (void); + virtual ~AST_Decl (); // Cleanup method. - virtual void destroy (void); + virtual void destroy (); // If this decl has been found, some types need to be // moved onto their true definitions etc. Defaults to @@ -206,28 +206,28 @@ public: virtual AST_Decl *adjust_found (bool ignore_fwd, bool full_def_only); // Is this decl a forward declared type (default false) - virtual bool is_fwd (void); + virtual bool is_fwd (); // Data Accessors. - bool imported (void); + bool imported (); void set_imported (bool is_it); - bool in_main_file (void); + bool in_main_file (); void set_in_main_file (bool is_it); - UTL_Scope *defined_in (void); + UTL_Scope *defined_in (); void set_defined_in (UTL_Scope *); - NodeType node_type (void); + NodeType node_type (); - long line (void); + long line (); void set_line (long l); - ACE_CString & file_name (void); + ACE_CString & file_name (); void set_file_name (ACE_CString s); - UTL_ScopedName *name (void); + UTL_ScopedName *name (); UTL_ScopedName *compute_name (const char *prefix, const char *suffix); @@ -236,36 +236,36 @@ public: void set_name (UTL_ScopedName *n); - Identifier *local_name (void); + Identifier *local_name (); void local_name (Identifier *id); Identifier *compute_local_name (const char *prefix, const char *sufix); // Apply prefix and suffix to the local name and return. - virtual const char *full_name (void); + virtual const char *full_name (); // Return the stringified full name. - virtual const char *flat_name (void); + virtual const char *flat_name (); // Return the flattened full scoped name. - const char *repoID (void); + const char *repoID (); void repoID (char *value); // Accessors for the repository ID. - const char *prefix (void); + const char *prefix (); void prefix (const char *value); // Accessors for the repository ID prefix. - const char *version (void); + const char *version (); void version (char *value); // Accessors for the version_ member. - bool anonymous (void) const; + bool anonymous () const; void anonymous (bool val); // Accessors for the anonymous_ member. - bool typeid_set (void) const; + bool typeid_set () const; void typeid_set (bool val); // Accessors for the typeid_set_ member. @@ -280,12 +280,12 @@ public: // prefix to the all the reserved keywords. But when we invoke the // operation remotely, we should be sending only the name with out // "_cxx_" prefix. - Identifier *original_local_name (void); + Identifier *original_local_name (); void original_local_name (Identifier *); // To be overridden by the subclasses interface, struct, union, and // the corresponding forward declaration classes. - virtual bool is_defined (void); + virtual bool is_defined (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -301,18 +301,18 @@ public: // Return TRUE if "this" is a child of "s". bool is_child (AST_Decl *s); - bool is_nested (void); + bool is_nested (); // Determines if we are inside of a nested scope or not. - UTL_ScopedName *last_referenced_as (void) const; + UTL_ScopedName *last_referenced_as () const; void last_referenced_as (UTL_ScopedName *n); // Accessors for the prefix_scope_ member. - UTL_Scope *prefix_scope (void); + UTL_Scope *prefix_scope (); void prefix_scope (UTL_Scope *s); // Useful for GIOP to know if a wstring is being marshaled. - virtual int contains_wstring (void); + virtual int contains_wstring (); void contains_wstring (int val); // Additional checks when we think we have caught an IDL @@ -321,7 +321,7 @@ public: bool masking_checks (AST_Decl *mod); // Accessors for the member. - bool in_tmpl_mod_not_aliased (void) const; + bool in_tmpl_mod_not_aliased () const; void in_tmpl_mod_not_aliased (bool val); /// Set and get annotations for this IDL element @@ -405,13 +405,13 @@ protected: void dump_i (ACE_OSTREAM_TYPE &o, const char *s) const ; - void compute_repoID (void); + void compute_repoID (); // Computes the repoID. - void compute_full_name (void); + void compute_full_name (); // Computes the stringified scoped name. - void compute_flat_name (void); + void compute_flat_name (); // Compute the flattened fully scoped name. const char *node_type_to_string (NodeType nt); diff --git a/TAO/TAO_IDL/include/ast_emits.h b/TAO/TAO_IDL/include/ast_emits.h index c19e620dafb..423a5f8a76a 100644 --- a/TAO/TAO_IDL/include/ast_emits.h +++ b/TAO/TAO_IDL/include/ast_emits.h @@ -12,10 +12,10 @@ public: AST_Emits (UTL_ScopedName *n, AST_Type *emits_type); - virtual ~AST_Emits (void); + virtual ~AST_Emits (); // Data Accessor. - AST_Type *emits_type (void) const; + AST_Type *emits_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_enum.h b/TAO/TAO_IDL/include/ast_enum.h index dc580f08ab2..32b18f78a4c 100644 --- a/TAO/TAO_IDL/include/ast_enum.h +++ b/TAO/TAO_IDL/include/ast_enum.h @@ -80,7 +80,7 @@ public: bool local, bool abstract); - virtual ~AST_Enum (void); + virtual ~AST_Enum (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); @@ -89,16 +89,16 @@ public: AST_EnumVal *lookup_by_value (const AST_Expression *v); // Get value to be assigned to next enumerator. - unsigned long next_enum_val (void); + unsigned long next_enum_val (); // Return the count of members - virtual int member_count (void); + virtual int member_count (); // Convert a numeric value to the enum's string name for it. UTL_ScopedName *value_to_name (const unsigned long v); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -108,7 +108,7 @@ public: virtual bool annotatable () const { return true; } private: - friend int tao_yyparse (void); + friend int tao_yyparse (); unsigned long pd_enum_counter; // Value for next enumerator. @@ -116,7 +116,7 @@ private: int member_count_; // Number of members. - int compute_member_count (void); + int compute_member_count (); // Count the number of members. virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v); diff --git a/TAO/TAO_IDL/include/ast_enum_val.h b/TAO/TAO_IDL/include/ast_enum_val.h index fcfa695315d..f1667000d0b 100644 --- a/TAO/TAO_IDL/include/ast_enum_val.h +++ b/TAO/TAO_IDL/include/ast_enum_val.h @@ -78,7 +78,7 @@ public: AST_EnumVal (ACE_CDR::ULong v, UTL_ScopedName *n); - virtual ~AST_EnumVal (void); + virtual ~AST_EnumVal (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_eventtype.h b/TAO/TAO_IDL/include/ast_eventtype.h index 10fb255cde7..f7243863e8c 100644 --- a/TAO/TAO_IDL/include/ast_eventtype.h +++ b/TAO/TAO_IDL/include/ast_eventtype.h @@ -20,10 +20,10 @@ public: bool truncatable, bool custom); - virtual ~AST_EventType (void); + virtual ~AST_EventType (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_eventtype_fwd.h b/TAO/TAO_IDL/include/ast_eventtype_fwd.h index 0913ae4e2e0..c859663a582 100644 --- a/TAO/TAO_IDL/include/ast_eventtype_fwd.h +++ b/TAO/TAO_IDL/include/ast_eventtype_fwd.h @@ -12,10 +12,10 @@ public: AST_EventTypeFwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~AST_EventTypeFwd (void); + virtual ~AST_EventTypeFwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_exception.h b/TAO/TAO_IDL/include/ast_exception.h index ebcb56fd145..76556795479 100644 --- a/TAO/TAO_IDL/include/ast_exception.h +++ b/TAO/TAO_IDL/include/ast_exception.h @@ -83,7 +83,7 @@ public: bool local, bool abstract); - virtual ~AST_Exception (void); + virtual ~AST_Exception (); virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Check if we or the parameter node is in recursion. @@ -95,7 +95,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_expression.h b/TAO/TAO_IDL/include/ast_expression.h index ec2dfc4eb22..9a975bf9502 100644 --- a/TAO/TAO_IDL/include/ast_expression.h +++ b/TAO/TAO_IDL/include/ast_expression.h @@ -161,7 +161,7 @@ public: // Structure to describe value of constant expression and its type. struct AST_ExprValue { - AST_ExprValue (void); + AST_ExprValue (); union { @@ -232,30 +232,30 @@ public: AST_Expression (const ACE_CDR::Fixed &f); // Destructor. - virtual ~AST_Expression (void); + virtual ~AST_Expression (); // Data Accessors. - UTL_Scope *defined_in (void); + UTL_Scope *defined_in (); void set_defined_in (UTL_Scope *d); - long line (void); + long line (); void set_line (long l); - UTL_String *file_name (void); + UTL_String *file_name (); void set_file_name (UTL_String *f); - ExprComb ec (void); + ExprComb ec (); - AST_ExprValue *ev (void); + AST_ExprValue *ev (); void set_ev (AST_ExprValue *new_ev); - AST_Expression *v1 (void); + AST_Expression *v1 (); void set_v1 (AST_Expression *e); - AST_Expression *v2 (void); + AST_Expression *v2 (); void set_v2 (AST_Expression *e); - UTL_ScopedName *n (void); + UTL_ScopedName *n (); void set_n (UTL_ScopedName *new_n); // AST Dumping. @@ -265,7 +265,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); // Other operations. @@ -286,10 +286,10 @@ public: long compare (AST_Expression *vc); // Accessor for the member. - AST_Decl *get_tdef (void) const; + AST_Decl *get_tdef () const; // Accessor for the member. - AST_Param_Holder *param_holder (void) const; + AST_Param_Holder *param_holder () const; static const char *exprtype_to_string (ExprType t); @@ -345,7 +345,7 @@ private: // Non-zero if we were created from a reference template param. // Fill out the lineno, filename and definition scope details. - void fill_definition_details (void); + void fill_definition_details (); // Internal evaluation. virtual AST_ExprValue *eval_internal (EvalKind ek); diff --git a/TAO/TAO_IDL/include/ast_extended_port.h b/TAO/TAO_IDL/include/ast_extended_port.h index 8e467d4977f..dd0fb686581 100644 --- a/TAO/TAO_IDL/include/ast_extended_port.h +++ b/TAO/TAO_IDL/include/ast_extended_port.h @@ -13,12 +13,12 @@ public: UTL_ScopedName *n, AST_PortType *porttype_ref); - virtual ~AST_Extended_Port (void); + virtual ~AST_Extended_Port (); - AST_PortType *port_type (void) const; + AST_PortType *port_type () const; // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_extern.h b/TAO/TAO_IDL/include/ast_extern.h index c2c9e0f00af..480182b2467 100644 --- a/TAO/TAO_IDL/include/ast_extern.h +++ b/TAO/TAO_IDL/include/ast_extern.h @@ -79,7 +79,7 @@ class AST_Decl; // type the full definition was also seen. extern void AST_record_fwd_decl (AST_Type *i); -extern TAO_IDL_FE_Export void AST_check_fwd_decls (void); +extern TAO_IDL_FE_Export void AST_check_fwd_decls (); extern bool AST_illegal_recursive_type (AST_Decl *t); extern bool AST_illegal_interface_recursion (AST_Decl *t); diff --git a/TAO/TAO_IDL/include/ast_factory.h b/TAO/TAO_IDL/include/ast_factory.h index c84ef84ca9e..d83aeacfd84 100644 --- a/TAO/TAO_IDL/include/ast_factory.h +++ b/TAO/TAO_IDL/include/ast_factory.h @@ -81,18 +81,18 @@ class TAO_IDL_FE_Export AST_Factory : public virtual AST_Decl, public: AST_Factory (UTL_ScopedName *n); - virtual ~AST_Factory (void); + virtual ~AST_Factory (); - UTL_ExceptList *exceptions (void); + UTL_ExceptList *exceptions (); // Return exception list. - int n_exceptions (void); + int n_exceptions (); // Return exception count. - virtual int argument_count (void); + virtual int argument_count (); // Return the count of members. - virtual int has_native (void); + virtual int has_native (); // Any of the arguments or the return value is a <native> type. // This is important because in that case no code should be // generated for the stubs. @@ -101,7 +101,7 @@ public: virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -129,12 +129,12 @@ protected: private: // Operations. - int compute_argument_attr (void); + int compute_argument_attr (); // Count the number of arguments. // Scope Management Protocol. - friend int tao_yyparse (void); + friend int tao_yyparse (); virtual AST_Argument *fe_add_argument (AST_Argument *a); virtual UTL_NameList *fe_add_exceptions (UTL_NameList *e); }; diff --git a/TAO/TAO_IDL/include/ast_field.h b/TAO/TAO_IDL/include/ast_field.h index 68d8fe39754..2949a69b97e 100644 --- a/TAO/TAO_IDL/include/ast_field.h +++ b/TAO/TAO_IDL/include/ast_field.h @@ -109,10 +109,10 @@ public: UTL_ScopedName *name, AST_Field *other); - virtual ~AST_Field (void); + virtual ~AST_Field (); // Data Accessors. - AST_Type *field_type (void) const; + AST_Type *field_type () const; /// Get and Set Visibility ///{ @@ -121,12 +121,12 @@ public: ///} // Are we or do we contain a wstring? - virtual int contains_wstring (void); + virtual int contains_wstring (); // Determine this bit of state after we have // be added to our aggregate type and before // we are destroyed. - void set_recursive_flag (void); + void set_recursive_flag (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -135,7 +135,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_finder.h b/TAO/TAO_IDL/include/ast_finder.h index 25d6dabd511..f66e44d910f 100644 --- a/TAO/TAO_IDL/include/ast_finder.h +++ b/TAO/TAO_IDL/include/ast_finder.h @@ -12,13 +12,13 @@ public: AST_Finder (UTL_ScopedName *n); - virtual ~AST_Finder (void); + virtual ~AST_Finder (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); diff --git a/TAO/TAO_IDL/include/ast_generator.h b/TAO/TAO_IDL/include/ast_generator.h index d4fd9fbac16..36c34f517d4 100644 --- a/TAO/TAO_IDL/include/ast_generator.h +++ b/TAO/TAO_IDL/include/ast_generator.h @@ -103,9 +103,9 @@ class AST_Annotation_Member; class TAO_IDL_FE_Export AST_Generator { public: - AST_Generator (void) {} + AST_Generator () {} - virtual ~AST_Generator (void) {} + virtual ~AST_Generator () {} // Operations. diff --git a/TAO/TAO_IDL/include/ast_home.h b/TAO/TAO_IDL/include/ast_home.h index 728b3af6a55..045c1357e8b 100644 --- a/TAO/TAO_IDL/include/ast_home.h +++ b/TAO/TAO_IDL/include/ast_home.h @@ -20,7 +20,7 @@ public: AST_Interface **supports_flat, long n_supports_flat); - virtual ~AST_Home (void); + virtual ~AST_Home (); // Extend lookup to the base home. virtual AST_Decl *look_in_inherited (UTL_ScopedName *e, @@ -37,20 +37,20 @@ public: // Accessors. - AST_Home *base_home (void) const; + AST_Home *base_home () const; - AST_Type **supports (void) const; + AST_Type **supports () const; - long n_supports (void) const; + long n_supports () const; - AST_Component *managed_component (void) const; + AST_Component *managed_component () const; - AST_Type *primary_key (void) const; + AST_Type *primary_key () const; void transfer_scope_elements (AST_Interface *dst); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -63,7 +63,7 @@ public: private: // Scope Management Protocol. - friend int tao_yyparse (void); + friend int tao_yyparse (); friend class ast_visitor_tmpl_module_inst; virtual AST_Factory *fe_add_factory (AST_Factory *f); diff --git a/TAO/TAO_IDL/include/ast_interface.h b/TAO/TAO_IDL/include/ast_interface.h index ebb57be4b30..a5fe7b023f5 100644 --- a/TAO/TAO_IDL/include/ast_interface.h +++ b/TAO/TAO_IDL/include/ast_interface.h @@ -85,7 +85,7 @@ public: bool local, bool abstract); - virtual ~AST_Interface (void); + virtual ~AST_Interface (); // This serves for interfaces, value types, components, and eventtypes. static void fwd_redefinition_helper (AST_Interface *&i, @@ -94,16 +94,16 @@ public: // Overridden for valuetypes, components, and eventtypes. virtual void redefine (AST_Interface *from); - AST_Type **inherits (void) const; + AST_Type **inherits () const; - long n_inherits (void) const; + long n_inherits () const; - AST_Interface **inherits_flat (void) const; + AST_Interface **inherits_flat () const; - long n_inherits_flat (void) const; + long n_inherits_flat () const; - ACE_Unbounded_Queue<AST_Type *> &get_insert_queue (void); - ACE_Unbounded_Queue<AST_Type *> &get_del_queue (void); + ACE_Unbounded_Queue<AST_Type *> &get_insert_queue (); + ACE_Unbounded_Queue<AST_Type *> &get_del_queue (); AST_Operation *be_add_operation (AST_Operation *); @@ -113,18 +113,18 @@ public: // Is this interface defined? This predicate returns FALSE when an // interface was forward declared but not defined yet, and TRUE in // all other cases. - bool is_defined (void); + bool is_defined (); // Check if we have redefined any of our parents' operations or attributes, // and check if there is such a clash among the parents - bool redef_clash (void); + bool redef_clash (); // Accessors for the member. - bool home_equiv (void) const; + bool home_equiv () const; void home_equiv (bool val); // Accessors for the member. - AST_InterfaceFwd *fwd_decl (void) const; + AST_InterfaceFwd *fwd_decl () const; void fwd_decl (AST_InterfaceFwd *node); // Look through inherited interfaces. @@ -135,29 +135,29 @@ public: bool full_def_only = false); /// Do we have both abstract and concrete parents? - int has_mixed_parentage (void); + int has_mixed_parentage (); /// Compute whether or not we have both abstract and concrete parents, /// and make a list of the abstract parents, if any. - void analyze_parentage (void); + void analyze_parentage (); // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; virtual AST_Decl *special_lookup (UTL_ScopedName *e, bool full_def_only, AST_Decl *&final_parent_decl); /// Accessors for the members. - AST_Interface *ami_handler (void) const; + AST_Interface *ami_handler () const; void ami_handler (AST_Interface *handler); - AST_Interface *ami4ccm_uses (void) const; + AST_Interface *ami4ccm_uses () const; void ami4ccm_uses (AST_Interface *implied); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_interface_fwd.h b/TAO/TAO_IDL/include/ast_interface_fwd.h index f0427fedd5c..101b39fd6d6 100644 --- a/TAO/TAO_IDL/include/ast_interface_fwd.h +++ b/TAO/TAO_IDL/include/ast_interface_fwd.h @@ -77,9 +77,9 @@ public: AST_InterfaceFwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~AST_InterfaceFwd (void); + virtual ~AST_InterfaceFwd (); - AST_Interface *full_definition (void); + AST_Interface *full_definition (); /** * Sets the full definition. If there is an existing dummy definition, it @@ -87,7 +87,7 @@ public: */ void set_full_definition (AST_Interface *nfd); - virtual bool is_defined (void); + virtual bool is_defined (); void set_as_defined (); /** @@ -98,14 +98,14 @@ public: */ void disown_full_definition (); - virtual bool is_local (void); - virtual bool is_valuetype (void); - virtual bool is_abstract_valuetype (void); + virtual bool is_local (); + virtual bool is_valuetype (); + virtual bool is_abstract_valuetype (); - bool full_def_seen (void); + bool full_def_seen (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); @@ -114,7 +114,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Is this decl a forward declared type (Yes) - virtual bool is_fwd (void); + virtual bool is_fwd (); // We don't actually want the forward declaration, // but want to return the full definition member, diff --git a/TAO/TAO_IDL/include/ast_mirror_port.h b/TAO/TAO_IDL/include/ast_mirror_port.h index dee54323979..3195c88da4a 100644 --- a/TAO/TAO_IDL/include/ast_mirror_port.h +++ b/TAO/TAO_IDL/include/ast_mirror_port.h @@ -12,10 +12,10 @@ public: UTL_ScopedName *n, AST_PortType *porttype_ref); - virtual ~AST_Mirror_Port (void); + virtual ~AST_Mirror_Port (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_module.h b/TAO/TAO_IDL/include/ast_module.h index 07da023f2f3..d697dcb785e 100644 --- a/TAO/TAO_IDL/include/ast_module.h +++ b/TAO/TAO_IDL/include/ast_module.h @@ -87,17 +87,17 @@ public: AST_Module (UTL_ScopedName *n, AST_Module *prev = 0); // Destructor. - virtual ~AST_Module (void); + virtual ~AST_Module (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Involved in OBV_ namespace generation. - void set_has_nested_valuetype (void); - bool has_nested_valuetype (void); + void set_has_nested_valuetype (); + bool has_nested_valuetype (); // Allows adding an interface at a later point. // The interface i is inserted after interface ix, if @@ -131,11 +131,11 @@ public: virtual int ast_accept (ast_visitor *visitor); // Accessors for the member. - AST_Template_Module_Inst *from_inst (void) const; + AST_Template_Module_Inst *from_inst () const; void from_inst (AST_Template_Module_Inst *node); // Accessors for the member. - AST_Template_Module_Ref *from_ref (void) const; + AST_Template_Module_Ref *from_ref () const; void from_ref (AST_Template_Module_Ref *node); // Override that looks in previous openings. @@ -234,7 +234,7 @@ public: // (called by AST_Root::destroy on the CORBA module containing // the basic types, since it isn't destroyed between processing // multiple IDL files. - void reset_last_in_same_parent_scope (void); + void reset_last_in_same_parent_scope (); virtual bool annotatable () const { return true; } diff --git a/TAO/TAO_IDL/include/ast_native.h b/TAO/TAO_IDL/include/ast_native.h index 389f61f593f..2a56f19a152 100644 --- a/TAO/TAO_IDL/include/ast_native.h +++ b/TAO/TAO_IDL/include/ast_native.h @@ -15,10 +15,10 @@ class TAO_IDL_FE_Export AST_Native : public virtual AST_Exception public: AST_Native (UTL_ScopedName *n); - virtual ~AST_Native (void); + virtual ~AST_Native (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_operation.h b/TAO/TAO_IDL/include/ast_operation.h index 3c8d277cb60..008fcc4616f 100644 --- a/TAO/TAO_IDL/include/ast_operation.h +++ b/TAO/TAO_IDL/include/ast_operation.h @@ -90,28 +90,28 @@ public: bool local, bool abstract); - virtual ~AST_Operation (void); + virtual ~AST_Operation (); // Data Accessors. - AST_Type *return_type (void); + AST_Type *return_type (); - Flags flags (void); + Flags flags (); - UTL_StrList *context (void); + UTL_StrList *context (); - UTL_ExceptList *exceptions (void); + UTL_ExceptList *exceptions (); // Public operations. - bool void_return_type (void); + bool void_return_type (); /// Returns 1 if the operation has a void return type. /// Return the number of arguments - virtual int argument_count (void); + virtual int argument_count (); /// Return the flag indicating a request sends argument data - virtual bool has_in_arguments (void); + virtual bool has_in_arguments (); /// Count the number of arguments of a certain type. /** @@ -125,7 +125,7 @@ public: */ int count_arguments_with_direction (int direction_mask); - virtual int has_native (void); + virtual int has_native (); // Any of the arguments or the return value is a <native> type. // This is important because in that case no code should be // generated for the stubs. @@ -134,7 +134,7 @@ public: virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -172,12 +172,12 @@ protected: // Operations. - int compute_argument_attr (void); + int compute_argument_attr (); // Count the number of arguments. // Scope Management Protocol. - friend int tao_yyparse (void); + friend int tao_yyparse (); virtual AST_Argument *fe_add_argument (AST_Argument *a); virtual UTL_StrList *fe_add_context (UTL_StrList *c); virtual UTL_NameList *fe_add_exceptions (UTL_NameList *e); diff --git a/TAO/TAO_IDL/include/ast_param_holder.h b/TAO/TAO_IDL/include/ast_param_holder.h index abd5ad403b1..17f4d66f41b 100644 --- a/TAO/TAO_IDL/include/ast_param_holder.h +++ b/TAO/TAO_IDL/include/ast_param_holder.h @@ -13,15 +13,15 @@ public: AST_Param_Holder (UTL_ScopedName *parameter_name, FE_Utils::T_Param_Info *info); - virtual ~AST_Param_Holder (void); + virtual ~AST_Param_Holder (); - FE_Utils::T_Param_Info const *info (void) const; + FE_Utils::T_Param_Info const *info () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); diff --git a/TAO/TAO_IDL/include/ast_porttype.h b/TAO/TAO_IDL/include/ast_porttype.h index aa98a84ee2a..20b0e92ea26 100644 --- a/TAO/TAO_IDL/include/ast_porttype.h +++ b/TAO/TAO_IDL/include/ast_porttype.h @@ -18,10 +18,10 @@ class TAO_IDL_FE_Export AST_PortType public: AST_PortType (UTL_ScopedName *n); - virtual ~AST_PortType (void); + virtual ~AST_PortType (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_predefined_type.h b/TAO/TAO_IDL/include/ast_predefined_type.h index 7e621aa8088..3969936f4ce 100644 --- a/TAO/TAO_IDL/include/ast_predefined_type.h +++ b/TAO/TAO_IDL/include/ast_predefined_type.h @@ -100,10 +100,10 @@ public: AST_PredefinedType (PredefinedType t, UTL_ScopedName *n); - virtual ~AST_PredefinedType (void); + virtual ~AST_PredefinedType (); // Data Accessors. - PredefinedType pt (void); + PredefinedType pt (); // AST Dumping virtual void dump (ACE_OSTREAM_TYPE &o); @@ -112,12 +112,12 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. private: diff --git a/TAO/TAO_IDL/include/ast_provides.h b/TAO/TAO_IDL/include/ast_provides.h index bb01a45d6b1..3d5b3f5c52b 100644 --- a/TAO/TAO_IDL/include/ast_provides.h +++ b/TAO/TAO_IDL/include/ast_provides.h @@ -10,10 +10,10 @@ public: AST_Provides (UTL_ScopedName *n, AST_Type *provides_type); - virtual ~AST_Provides (void); + virtual ~AST_Provides (); // Data Accessor. - AST_Type *provides_type (void) const; + AST_Type *provides_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -22,7 +22,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_publishes.h b/TAO/TAO_IDL/include/ast_publishes.h index b1ac2051e36..96295e30067 100644 --- a/TAO/TAO_IDL/include/ast_publishes.h +++ b/TAO/TAO_IDL/include/ast_publishes.h @@ -12,10 +12,10 @@ public: AST_Publishes (UTL_ScopedName *n, AST_Type *publishes_type); - virtual ~AST_Publishes (void); + virtual ~AST_Publishes (); // Data Accessor. - AST_Type *publishes_type (void) const; + AST_Type *publishes_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; }; diff --git a/TAO/TAO_IDL/include/ast_root.h b/TAO/TAO_IDL/include/ast_root.h index e3750e20934..8c3b50d01f1 100644 --- a/TAO/TAO_IDL/include/ast_root.h +++ b/TAO/TAO_IDL/include/ast_root.h @@ -75,9 +75,9 @@ class TAO_IDL_FE_Export AST_Root : public virtual AST_Module public: AST_Root (UTL_ScopedName *n); - virtual ~AST_Root (void); + virtual ~AST_Root (); - virtual unsigned long nmembers (void); + virtual unsigned long nmembers (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -89,13 +89,13 @@ public: virtual void destroy (); // Final cleanup. - void fini (void); + void fini (); static AST_Decl::NodeType const NT; private: friend class FE_Declarator; - friend int tao_yyparse (void); + friend int tao_yyparse (); // Add protocol. diff --git a/TAO/TAO_IDL/include/ast_sequence.h b/TAO/TAO_IDL/include/ast_sequence.h index e165bd03ed6..d1f1d94abda 100644 --- a/TAO/TAO_IDL/include/ast_sequence.h +++ b/TAO/TAO_IDL/include/ast_sequence.h @@ -81,30 +81,30 @@ public: bool local, bool abstract); - virtual ~AST_Sequence (void); + virtual ~AST_Sequence (); virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the node represented by node involved in recursion. // Data Accessors. - AST_Expression *max_size (void); + AST_Expression *max_size (); - AST_Type *base_type (void) const; + AST_Type *base_type () const; - virtual bool unbounded (void) const; + virtual bool unbounded () const; // Is this sequence bounded or not. // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Is the element type a forward declared struct or union // that hasn't yet been fully defined? - virtual bool is_defined (void); + virtual bool is_defined (); // Cleanup method. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/ast_string.h b/TAO/TAO_IDL/include/ast_string.h index 75ea44326e1..71ad8c1e935 100644 --- a/TAO/TAO_IDL/include/ast_string.h +++ b/TAO/TAO_IDL/include/ast_string.h @@ -82,11 +82,11 @@ public: AST_Expression *max_size, long wide = 1); - virtual ~AST_String (void); + virtual ~AST_String (); // Data Accessors. - AST_Expression *max_size (void); - long width (void); + AST_Expression *max_size (); + long width (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -95,7 +95,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_structure.h b/TAO/TAO_IDL/include/ast_structure.h index 48d4341e6a4..15eb9c2dd65 100644 --- a/TAO/TAO_IDL/include/ast_structure.h +++ b/TAO/TAO_IDL/include/ast_structure.h @@ -94,7 +94,7 @@ public: bool local, bool abstract); - virtual ~AST_Structure (void); + virtual ~AST_Structure (); // This serves for both structs and unions. static void fwd_redefinition_helper (AST_Structure *&i, @@ -103,50 +103,50 @@ public: // Overridden for unions. virtual void redefine (AST_Structure *from); - virtual int member_count (void); + virtual int member_count (); // Return the count of members. - virtual ACE_CDR::ULong nfields (void) const; + virtual ACE_CDR::ULong nfields () const; // Return the count of actual fields. virtual int field (AST_Field **&result, ACE_CDR::ULong slot) const; // Get an individual field node. - virtual bool is_local (void); + virtual bool is_local (); // Overwrite the is_local method. virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the node represented by node involved in recursion. - virtual int contains_wstring (void); + virtual int contains_wstring (); // Do we contain a wstring at some nesting level? // Is this struct or union defined? This predicate returns FALSE when a // forward declaration is not defined yet, and TRUE in // all other cases. - virtual bool is_defined (void); + virtual bool is_defined (); // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Accessors for the member. - AST_StructureFwd *fwd_decl (void) const; + AST_StructureFwd *fwd_decl () const; void fwd_decl (AST_StructureFwd *node); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); // Accessor for the member. - ACE_Unbounded_Queue<AST_Field *> &fields (void); + ACE_Unbounded_Queue<AST_Field *> &fields (); static AST_Decl::NodeType const NT; @@ -161,7 +161,7 @@ public: ///} protected: - friend int tao_yyparse (void); + friend int tao_yyparse (); // Scope Management Protocol. virtual AST_Union *fe_add_union (AST_Union *u); @@ -172,7 +172,7 @@ protected: virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v); - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. ACE_Unbounded_Queue<AST_Field *> fields_; @@ -181,7 +181,7 @@ protected: // the struct. private: - int compute_member_count (void); + int compute_member_count (); // Count the number of members. int member_count_; diff --git a/TAO/TAO_IDL/include/ast_structure_fwd.h b/TAO/TAO_IDL/include/ast_structure_fwd.h index 0e610192ea7..f459c558505 100644 --- a/TAO/TAO_IDL/include/ast_structure_fwd.h +++ b/TAO/TAO_IDL/include/ast_structure_fwd.h @@ -13,16 +13,16 @@ public: AST_StructureFwd (AST_Structure *full_defn, UTL_ScopedName *n); - virtual ~AST_StructureFwd (void); + virtual ~AST_StructureFwd (); - AST_Structure *full_definition (void); + AST_Structure *full_definition (); void set_full_definition (AST_Structure *nfd); - virtual bool is_defined (void); - void set_as_defined (void); + virtual bool is_defined (); + void set_as_defined (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); @@ -31,7 +31,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Is this decl a forward declared type (Yes) - virtual bool is_fwd (void); + virtual bool is_fwd (); // We don't actually want the forward declaration, // but want to return the full definition member, diff --git a/TAO/TAO_IDL/include/ast_template_module.h b/TAO/TAO_IDL/include/ast_template_module.h index 2908afed679..5f1e5d4e8f2 100644 --- a/TAO/TAO_IDL/include/ast_template_module.h +++ b/TAO/TAO_IDL/include/ast_template_module.h @@ -15,10 +15,10 @@ public: AST_Template_Module (UTL_ScopedName *n, FE_Utils::T_PARAMLIST_INFO *template_params); - virtual ~AST_Template_Module (void); + virtual ~AST_Template_Module (); FE_Utils::T_PARAMLIST_INFO * - template_params (void) const; + template_params () const; // Checks for errors in the template args of an instantiation. bool match_arg_names (FE_Utils::T_ARGLIST *args); @@ -30,7 +30,7 @@ public: virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); diff --git a/TAO/TAO_IDL/include/ast_template_module_inst.h b/TAO/TAO_IDL/include/ast_template_module_inst.h index 5adb0e898f2..d56fc150dc1 100644 --- a/TAO/TAO_IDL/include/ast_template_module_inst.h +++ b/TAO/TAO_IDL/include/ast_template_module_inst.h @@ -15,18 +15,18 @@ public: AST_Template_Module *ref, FE_Utils::T_ARGLIST *template_args); - virtual ~AST_Template_Module_Inst (void); + virtual ~AST_Template_Module_Inst (); - AST_Template_Module *ref (void) const; + AST_Template_Module *ref () const; FE_Utils::T_ARGLIST const * - template_args (void) const; + template_args () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); diff --git a/TAO/TAO_IDL/include/ast_template_module_ref.h b/TAO/TAO_IDL/include/ast_template_module_ref.h index 30a5b0ee81b..7273bc0e381 100644 --- a/TAO/TAO_IDL/include/ast_template_module_ref.h +++ b/TAO/TAO_IDL/include/ast_template_module_ref.h @@ -15,17 +15,17 @@ public: AST_Template_Module *ref, UTL_StrList *param_refs); - virtual ~AST_Template_Module_Ref (void); + virtual ~AST_Template_Module_Ref (); - AST_Template_Module *ref (void) const; + AST_Template_Module *ref () const; - UTL_StrList *param_refs (void) const; + UTL_StrList *param_refs () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -39,7 +39,7 @@ public: virtual AST_Decl *adjust_found (bool ignore_fwd, bool full_def_only); /// Accessors for the member. - bool processed (void) const; + bool processed () const; void processed (bool val); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_type.h b/TAO/TAO_IDL/include/ast_type.h index 9b10b6a2821..5cda580cf1c 100644 --- a/TAO/TAO_IDL/include/ast_type.h +++ b/TAO/TAO_IDL/include/ast_type.h @@ -90,7 +90,7 @@ public: AST_Type (AST_Decl::NodeType nt, UTL_ScopedName *n); - virtual ~AST_Type (void); + virtual ~AST_Type (); virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Determine if we are involved in some kind of limited recursion. @@ -101,21 +101,21 @@ public: virtual void size_type (SIZE_TYPE); // Set the size type. - virtual SIZE_TYPE size_type (void); + virtual SIZE_TYPE size_type (); // Return our size type. // Accessors/mutators for the private members. - bool has_constructor (void); + bool has_constructor (); // Accessor for protected member. void has_constructor (bool value); // Mutator for protected member. - bool ifr_added (void); + bool ifr_added (); void ifr_added (bool val); - bool ifr_fwd_added (void); + bool ifr_fwd_added (); void ifr_fwd_added (bool val); const char *nested_type_name (AST_Decl *d, @@ -123,10 +123,10 @@ public: const char *prefix = 0); // Type name of a node used when generating declarations. - AST_Type *unaliased_type (void); + AST_Type *unaliased_type (); // Utility function to make sure we are using the unaliased type. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. @@ -135,10 +135,10 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Determine our size type and set it if it is unknown. const char *nested_name (const char *local_name, diff --git a/TAO/TAO_IDL/include/ast_typedef.h b/TAO/TAO_IDL/include/ast_typedef.h index cd3d776165c..b1181cb18e8 100644 --- a/TAO/TAO_IDL/include/ast_typedef.h +++ b/TAO/TAO_IDL/include/ast_typedef.h @@ -81,24 +81,24 @@ public: bool local, bool abstract); - virtual ~AST_Typedef (void); + virtual ~AST_Typedef (); - AST_Type *primitive_base_type (void) const; + AST_Type *primitive_base_type () const; // Return the most primitive base type by traversing the chain of typedefed // base types. // Data Accessors. - AST_Type *base_type (void) const; + AST_Type *base_type () const; - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool is_local (void); + virtual bool is_local (); // Override the base class method. - bool owns_base_type (void) const; + bool owns_base_type () const; void owns_base_type (bool val); // Sometimes this has to be accessed or managed from outside. @@ -109,7 +109,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; @@ -121,7 +121,7 @@ public: virtual AST_Annotation_Appls &annotations (); protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. /** diff --git a/TAO/TAO_IDL/include/ast_union.h b/TAO/TAO_IDL/include/ast_union.h index 4815d0736d8..dafa8e704de 100644 --- a/TAO/TAO_IDL/include/ast_union.h +++ b/TAO/TAO_IDL/include/ast_union.h @@ -84,7 +84,7 @@ public: bool local, bool abstract); - virtual ~AST_Union (void); + virtual ~AST_Union (); // This also calls the base class version. virtual void redefine (AST_Structure *from); @@ -94,9 +94,9 @@ public: // Data Accessors. - AST_ConcreteType *disc_type (void); + AST_ConcreteType *disc_type (); - AST_Expression::ExprType udisc_type (void); + AST_Expression::ExprType udisc_type (); struct DefaultValue { @@ -123,7 +123,7 @@ public: int default_value (DefaultValue &); // Get the default value. - virtual int default_index (void); + virtual int default_index (); // Return the default index used. // AST Dumping. @@ -143,7 +143,7 @@ public: ///} protected: - virtual int compute_size_type (void); + virtual int compute_size_type (); // Compute the size type if it is unknown. virtual AST_UnionBranch *fe_add_union_branch (AST_UnionBranch *b); @@ -165,7 +165,7 @@ private: AST_UnionBranch *lookup_branch (AST_UnionBranch *branch); // Look up the branch with the "default" label. - AST_UnionBranch *lookup_default (void); + AST_UnionBranch *lookup_default (); // Look up a branch given a branch with a label. This is used to // check for duplicate labels. @@ -175,7 +175,7 @@ private: // check for duplicate enum labels. AST_UnionBranch *lookup_enum (AST_UnionBranch *b); - friend int tao_yyparse (void); + friend int tao_yyparse (); friend class ast_visitor_tmpl_module_inst; // Scope Management Protocol. @@ -188,10 +188,10 @@ private: virtual AST_EnumVal *fe_add_enum_val (AST_EnumVal *v); - virtual int compute_default_value (void); + virtual int compute_default_value (); // Compute the default value (if any). - int compute_default_index (void); + int compute_default_index (); // Count the default index. DefaultValue default_value_; diff --git a/TAO/TAO_IDL/include/ast_union_branch.h b/TAO/TAO_IDL/include/ast_union_branch.h index e1427765f7c..988b06811da 100644 --- a/TAO/TAO_IDL/include/ast_union_branch.h +++ b/TAO/TAO_IDL/include/ast_union_branch.h @@ -84,13 +84,13 @@ public: AST_Type *ft, UTL_ScopedName *n); - virtual ~AST_UnionBranch (void); + virtual ~AST_UnionBranch (); - UTL_LabelList *labels (void) const; + UTL_LabelList *labels () const; AST_UnionLabel *label (unsigned long index = 0); - unsigned long label_list_length (void); + unsigned long label_list_length (); // Called if our labels are enum values - adds them to the // enclosing scope's name_referenced list. @@ -110,7 +110,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_union_fwd.h b/TAO/TAO_IDL/include/ast_union_fwd.h index 65dc9013a93..14a6121d7e3 100644 --- a/TAO/TAO_IDL/include/ast_union_fwd.h +++ b/TAO/TAO_IDL/include/ast_union_fwd.h @@ -14,10 +14,10 @@ public: AST_UnionFwd (AST_Union *dummy, UTL_ScopedName *n); - virtual ~AST_UnionFwd (void); + virtual ~AST_UnionFwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_union_label.h b/TAO/TAO_IDL/include/ast_union_label.h index 87f66e08704..28c5e0275f2 100644 --- a/TAO/TAO_IDL/include/ast_union_label.h +++ b/TAO/TAO_IDL/include/ast_union_label.h @@ -87,11 +87,11 @@ public: AST_UnionLabel (UnionLabel lk, AST_Expression *lv); - virtual ~AST_UnionLabel (void); + virtual ~AST_UnionLabel (); - UnionLabel label_kind (void); + UnionLabel label_kind (); - AST_Expression *label_val (void); + AST_Expression *label_val (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -100,7 +100,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // Data. diff --git a/TAO/TAO_IDL/include/ast_uses.h b/TAO/TAO_IDL/include/ast_uses.h index f34d66d4ec5..9da57a5327f 100644 --- a/TAO/TAO_IDL/include/ast_uses.h +++ b/TAO/TAO_IDL/include/ast_uses.h @@ -11,11 +11,11 @@ public: AST_Type *uses_type, bool is_multiple); - virtual ~AST_Uses (void); + virtual ~AST_Uses (); // Data Accessors. - AST_Type *uses_type (void) const; - bool is_multiple (void) const; + AST_Type *uses_type () const; + bool is_multiple () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -24,7 +24,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_valuebox.h b/TAO/TAO_IDL/include/ast_valuebox.h index 40e5cc87c50..4ea5ec52eb5 100644 --- a/TAO/TAO_IDL/include/ast_valuebox.h +++ b/TAO/TAO_IDL/include/ast_valuebox.h @@ -10,10 +10,10 @@ public: AST_ValueBox (UTL_ScopedName *n, AST_Type *boxed_type); - virtual ~AST_ValueBox (void); + virtual ~AST_ValueBox (); // Data Accessors. - AST_Type *boxed_type (void) const; + AST_Type *boxed_type () const; // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -22,7 +22,7 @@ public: virtual int ast_accept (ast_visitor *visitor); // Cleanup. - virtual void destroy (void); + virtual void destroy (); static AST_Decl::NodeType const NT; diff --git a/TAO/TAO_IDL/include/ast_valuetype.h b/TAO/TAO_IDL/include/ast_valuetype.h index 4f5583e41b3..9309da49809 100644 --- a/TAO/TAO_IDL/include/ast_valuetype.h +++ b/TAO/TAO_IDL/include/ast_valuetype.h @@ -21,7 +21,7 @@ public: bool truncatable, bool custom); - virtual ~AST_ValueType (void); + virtual ~AST_ValueType (); virtual bool in_recursion (ACE_Unbounded_Queue<AST_Type *> &list); // Are we or the node represented by node involved in recursion. @@ -29,18 +29,18 @@ public: // This also calls the base class version. virtual void redefine (AST_Interface *from); - AST_Type **supports (void) const; + AST_Type **supports () const; - long n_supports (void) const; + long n_supports () const; - AST_Type *inherits_concrete (void) const; + AST_Type *inherits_concrete () const; - AST_Type *supports_concrete (void) const; + AST_Type *supports_concrete () const; - bool truncatable (void) const; - bool custom (void) const; + bool truncatable () const; + bool custom () const; - virtual bool will_have_factory (void); + virtual bool will_have_factory (); // Called from y.tab.cpp to set the factory decl seen bit. // Look up a scoped name in the supported interface list. @@ -55,10 +55,10 @@ public: // Recursively called on valuetype to check for legal use as // a primary key. Overridden for valuetype, struct, sequence, // union, array, typedef, and interface. - virtual bool legal_for_primary_key (void) const; + virtual bool legal_for_primary_key () const; // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &o); @@ -84,7 +84,7 @@ protected: bool derived_from_primary_key_base (const AST_ValueType *node, const AST_ValueType *pk_base) const; - AST_ValueType *lookup_primary_key_base (void) const; + AST_ValueType *lookup_primary_key_base () const; }; #endif // _AST_INTERFACE_AST_VALUETYPE_HH diff --git a/TAO/TAO_IDL/include/ast_valuetype_fwd.h b/TAO/TAO_IDL/include/ast_valuetype_fwd.h index 736271cc50c..6e9e9ce38b4 100644 --- a/TAO/TAO_IDL/include/ast_valuetype_fwd.h +++ b/TAO/TAO_IDL/include/ast_valuetype_fwd.h @@ -12,10 +12,10 @@ public: AST_ValueTypeFwd (AST_Interface *dummy, UTL_ScopedName *n); - virtual ~AST_ValueTypeFwd (void); + virtual ~AST_ValueTypeFwd (); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // AST Dumping. virtual void dump (ACE_OSTREAM_TYPE &); diff --git a/TAO/TAO_IDL/include/ast_visitor.h b/TAO/TAO_IDL/include/ast_visitor.h index 3a45c23a461..70c4fc73f7e 100644 --- a/TAO/TAO_IDL/include/ast_visitor.h +++ b/TAO/TAO_IDL/include/ast_visitor.h @@ -85,7 +85,7 @@ class AST_Annotation_Decl; class TAO_IDL_FE_Export ast_visitor { public: - virtual ~ast_visitor (void); + virtual ~ast_visitor (); virtual int visit_decl (AST_Decl *d) = 0; virtual int visit_scope (UTL_Scope *node) = 0; @@ -143,7 +143,7 @@ public: protected: // For abstract class. - ast_visitor (void); + ast_visitor (); }; #endif /* TAO_IDL_FE_DLL_AST_VISITOR_H */ diff --git a/TAO/TAO_IDL/include/ast_visitor_context.h b/TAO/TAO_IDL/include/ast_visitor_context.h index 2c8ddd419db..7890633316a 100644 --- a/TAO/TAO_IDL/include/ast_visitor_context.h +++ b/TAO/TAO_IDL/include/ast_visitor_context.h @@ -23,18 +23,18 @@ class TAO_IDL_FE_Export ast_visitor_context { public: - ast_visitor_context (void); + ast_visitor_context (); ast_visitor_context (const ast_visitor_context &ctx); - ~ast_visitor_context (void); + ~ast_visitor_context (); // Accessors/mutators for template-related storage. - FE_Utils::T_PARAMLIST_INFO *template_params (void) const; + FE_Utils::T_PARAMLIST_INFO *template_params () const; void template_params (FE_Utils::T_PARAMLIST_INFO *args); - FE_Utils::T_ARGLIST const *template_args (void) const; + FE_Utils::T_ARGLIST const *template_args () const; void template_args (FE_Utils::T_ARGLIST const *args); protected: diff --git a/TAO/TAO_IDL/include/ast_visitor_reifying.h b/TAO/TAO_IDL/include/ast_visitor_reifying.h index 2ad0fdceea1..6c7c5ef2981 100644 --- a/TAO/TAO_IDL/include/ast_visitor_reifying.h +++ b/TAO/TAO_IDL/include/ast_visitor_reifying.h @@ -42,9 +42,9 @@ class ast_visitor_reifying : public ast_visitor public: ast_visitor_reifying (ast_visitor_context *ctx); - virtual ~ast_visitor_reifying (void); + virtual ~ast_visitor_reifying (); - AST_Decl *reified_node (void) const; + AST_Decl *reified_node () const; virtual int visit_decl (AST_Decl *d); virtual int visit_scope (UTL_Scope *node); diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h index c9270d73a14..1a0dafdd241 100644 --- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h +++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_inst.h @@ -38,7 +38,7 @@ public: ast_visitor_tmpl_module_inst (ast_visitor_context *ctx, bool ref_only = false); - virtual ~ast_visitor_tmpl_module_inst (void); + virtual ~ast_visitor_tmpl_module_inst (); virtual int visit_decl (AST_Decl *d); virtual int visit_scope (UTL_Scope *node); diff --git a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h index 4b45f2a5abf..9ac63d648f9 100644 --- a/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h +++ b/TAO/TAO_IDL/include/ast_visitor_tmpl_module_ref.h @@ -29,7 +29,7 @@ class ast_visitor_tmpl_module_ref public: ast_visitor_tmpl_module_ref (ast_visitor_context *ctx); - virtual ~ast_visitor_tmpl_module_ref (void); + virtual ~ast_visitor_tmpl_module_ref (); virtual int visit_template_module_ref (AST_Template_Module_Ref *node); }; diff --git a/TAO/TAO_IDL/include/drv_extern.h b/TAO/TAO_IDL/include/drv_extern.h index 757d14db7e1..03a543b161f 100644 --- a/TAO/TAO_IDL/include/drv_extern.h +++ b/TAO/TAO_IDL/include/drv_extern.h @@ -67,17 +67,17 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // External functions for the IDL compiler driver program. extern void DRV_parse_args (long, char **); -extern void DRV_usage (void); +extern void DRV_usage (); extern void DRV_pre_proc (char const * myfile); -extern void DRV_store_env_include_paths (void); -extern void DRV_cpp_init (void); +extern void DRV_store_env_include_paths (); +extern void DRV_cpp_init (); extern ACE_CString& DRV_add_include_path (ACE_CString&, const char* p, const char* suffix, bool is_system); -extern void DRV_cpp_post_init (void); +extern void DRV_cpp_post_init (); extern void DRV_cpp_putarg (char const * str); extern void DRV_cpp_new_location (char const * new_loc); -extern void DRV_get_orb_idl_includes (void); +extern void DRV_get_orb_idl_includes (); // Not used by all backends. extern void DRV_push_file (char const * s); diff --git a/TAO/TAO_IDL/include/fe_component_header.h b/TAO/TAO_IDL/include/fe_component_header.h index 4e14c6426d4..55280e7ade4 100644 --- a/TAO/TAO_IDL/include/fe_component_header.h +++ b/TAO/TAO_IDL/include/fe_component_header.h @@ -20,14 +20,14 @@ public: UTL_ScopedName *base_component, UTL_NameList *supports, bool compile_now); - virtual ~FE_ComponentHeader (void); + virtual ~FE_ComponentHeader (); // Data Accessors. - AST_Component *base_component (void) const; - AST_Type **supports (void) const; - long n_supports (void) const; - AST_Interface **supports_flat (void) const; - long n_supports_flat (void) const; + AST_Component *base_component () const; + AST_Type **supports () const; + long n_supports () const; + AST_Interface **supports_flat () const; + long n_supports_flat () const; protected: void compile_inheritance (UTL_ScopedName *base_component); diff --git a/TAO/TAO_IDL/include/fe_declarator.h b/TAO/TAO_IDL/include/fe_declarator.h index d55d8c3a735..98f5ce06a95 100644 --- a/TAO/TAO_IDL/include/fe_declarator.h +++ b/TAO/TAO_IDL/include/fe_declarator.h @@ -86,19 +86,19 @@ public: FE_Declarator (UTL_ScopedName *n, DeclaratorType dt, AST_Decl *cp); - virtual ~FE_Declarator (void) {} + virtual ~FE_Declarator () {} // Data Accessors. - AST_Decl *complex_part (void); - UTL_ScopedName *name (void); - DeclaratorType decl_type (void); + AST_Decl *complex_part (); + UTL_ScopedName *name (); + DeclaratorType decl_type (); // Other Operations. // Compose an FE_Declarator into an AST_Type once all the needed information // is available. AST_Type *compose (AST_Decl* tc); - virtual void destroy (void); + virtual void destroy (); private: // Data. diff --git a/TAO/TAO_IDL/include/fe_extern.h b/TAO/TAO_IDL/include/fe_extern.h index 47f95a109c5..206f1ed679e 100644 --- a/TAO/TAO_IDL/include/fe_extern.h +++ b/TAO/TAO_IDL/include/fe_extern.h @@ -71,15 +71,15 @@ trademarks or registered trademarks of Sun Microsystems, Inc. // Declares all global functions for the FE -TAO_IDL_FE_Export void FE_init (void); -TAO_IDL_FE_Export void FE_populate (void); +TAO_IDL_FE_Export void FE_init (); +TAO_IDL_FE_Export void FE_populate (); TAO_IDL_FE_Export void FE_extract_env_include_paths (ACE_Unbounded_Queue<ACE_CString> &list); -TAO_IDL_FE_Export void FE_store_env_include_paths (void); -TAO_IDL_FE_Export const char *FE_get_cpp_loc_from_env (void); -TAO_IDL_FE_Export const char *FE_get_cpp_args_from_env (void); +TAO_IDL_FE_Export void FE_store_env_include_paths (); +TAO_IDL_FE_Export const char *FE_get_cpp_loc_from_env (); +TAO_IDL_FE_Export const char *FE_get_cpp_args_from_env (); TAO_IDL_FE_Export int -FE_yyparse (void); +FE_yyparse (); TAO_IDL_FE_Export void FE_yydebug (bool); @@ -97,10 +97,10 @@ class UTL_Error; class UTL_Indenter; TAO_IDL_FE_Export UTL_Error * -FE_new_UTL_Error (void); +FE_new_UTL_Error (); TAO_IDL_FE_Export UTL_Indenter * -FE_new_UTL_Indenter (void); +FE_new_UTL_Indenter (); /** * Exception thrown when exiting prematurely in the front end. diff --git a/TAO/TAO_IDL/include/fe_home_header.h b/TAO/TAO_IDL/include/fe_home_header.h index 7583a75a398..ae13bc609cc 100644 --- a/TAO/TAO_IDL/include/fe_home_header.h +++ b/TAO/TAO_IDL/include/fe_home_header.h @@ -23,12 +23,12 @@ public: UTL_ScopedName *managed_component, UTL_ScopedName *primary_key); - virtual ~FE_HomeHeader (void); + virtual ~FE_HomeHeader (); // Data Accessors. - AST_Home *base_home (void) const; - AST_Component *managed_component (void) const; - AST_Type *primary_key (void) const; + AST_Home *base_home () const; + AST_Component *managed_component () const; + AST_Type *primary_key () const; protected: AST_Home *base_home_; diff --git a/TAO/TAO_IDL/include/fe_interface_header.h b/TAO/TAO_IDL/include/fe_interface_header.h index 243e5dda333..55394c44e90 100644 --- a/TAO/TAO_IDL/include/fe_interface_header.h +++ b/TAO/TAO_IDL/include/fe_interface_header.h @@ -84,22 +84,22 @@ public: bool is_abstract, bool compile_now); - virtual ~FE_InterfaceHeader (void); + virtual ~FE_InterfaceHeader (); // Data Accessors. - UTL_ScopedName *name (void) const; - AST_Type **inherits (void) const; - long n_inherits (void) const; - AST_Interface **inherits_flat (void) const; - long n_inherits_flat (void) const; + UTL_ScopedName *name () const; + AST_Type **inherits () const; + long n_inherits () const; + AST_Interface **inherits_flat () const; + long n_inherits_flat () const; - bool is_local (void) const; + bool is_local () const; // See if we are a local interface. - bool is_abstract (void) const; + bool is_abstract () const; // See if we are an abstract interface. - virtual void destroy (void); + virtual void destroy (); // Destroy anything allocated for this class. // Operations. @@ -121,9 +121,9 @@ protected: bool already_seen (AST_Type *ip); bool already_seen_flat (AST_Interface *ip); - void install_in_header (void); + void install_in_header (); - void destroy_flat_arrays (void); + void destroy_flat_arrays (); // Data. protected: diff --git a/TAO/TAO_IDL/include/fe_obv_header.h b/TAO/TAO_IDL/include/fe_obv_header.h index 0a25d4310c1..0dc51b91176 100644 --- a/TAO/TAO_IDL/include/fe_obv_header.h +++ b/TAO/TAO_IDL/include/fe_obv_header.h @@ -18,16 +18,16 @@ public: UTL_NameList *supports, bool truncatable, bool is_eventtype = false); - virtual ~FE_OBVHeader (void); + virtual ~FE_OBVHeader (); // Data Accessors. - AST_Type **supports (void) const; - long n_supports (void) const; - AST_Type *inherits_concrete (void) const; - AST_Type *supports_concrete (void) const; - bool truncatable (void) const; + AST_Type **supports () const; + long n_supports () const; + AST_Type *inherits_concrete () const; + AST_Type *supports_concrete () const; + bool truncatable () const; - virtual void destroy (void); + virtual void destroy (); // Destroy anything allocated for this class. protected: diff --git a/TAO/TAO_IDL/include/fe_utils.h b/TAO/TAO_IDL/include/fe_utils.h index 6cf66a62418..fddc6e5202d 100644 --- a/TAO/TAO_IDL/include/fe_utils.h +++ b/TAO/TAO_IDL/include/fe_utils.h @@ -27,7 +27,7 @@ struct TAO_IDL_FE_Export FE_Utils ACE_CString name_; ACE_CString seq_param_ref_; - T_Param_Info (void); + T_Param_Info (); }; typedef ACE_Unbounded_Queue<T_Param_Info> T_PARAMLIST_INFO; @@ -36,7 +36,7 @@ struct TAO_IDL_FE_Export FE_Utils struct T_ARGLIST : ACE_Unbounded_Queue<AST_Decl *> { - void destroy (void); + void destroy (); }; /// Convert from a predefined type to an expression type. @@ -68,7 +68,7 @@ struct TAO_IDL_FE_Export FE_Utils /// For the executor IDL file, when a pragma ciao ami receptacle /// name is multiplex. static void - create_implied_ami_uses_stuff (void); + create_implied_ami_uses_stuff (); /// Case insensitive for Windows, otherwise not. static int @@ -97,7 +97,7 @@ struct TAO_IDL_FE_Export FE_Utils /// Validate the included idl files, somefiles might have been /// ignored by the preprocessor. static void - validate_included_idl_files (void); + validate_included_idl_files (); /// Check if included file is in TAO specific include dirs. static bool diff --git a/TAO/TAO_IDL/include/idl_global.h b/TAO/TAO_IDL/include/idl_global.h index d00dffdcbd8..485486a60dd 100644 --- a/TAO/TAO_IDL/include/idl_global.h +++ b/TAO/TAO_IDL/include/idl_global.h @@ -311,77 +311,77 @@ public: UNKNOWN_ANNOTATIONS_IGNORE }; - IDL_GlobalData (void); - ~IDL_GlobalData (void); + IDL_GlobalData (); + ~IDL_GlobalData (); // Operations - UTL_ScopeStack &scopes (void); // Scopes stack + UTL_ScopeStack &scopes (); // Scopes stack - AST_Root *root (void); // Root of AST + AST_Root *root (); // Root of AST void set_root (AST_Root *); // Set it - AST_Generator *gen (void); // Generator + AST_Generator *gen (); // Generator void set_gen (AST_Generator *); // Set it - AST_ValueType *primary_key_base (void); // PrimaryKeyBase + AST_ValueType *primary_key_base (); // PrimaryKeyBase void primary_key_base (AST_ValueType *); // Set it - UTL_Error *err (void); // Error reporter + UTL_Error *err (); // Error reporter void set_err (UTL_Error *); // Set it - int err_count (void); // How many errors? + int err_count (); // How many errors? void set_err_count (int); // Set it - long lineno (void); // Where in file? + long lineno (); // Where in file? void set_lineno (long); // Set it - UTL_String *filename (void); // What file? + UTL_String *filename (); // What file? void set_filename (UTL_String *); // Set it - UTL_String *main_filename (void); // What's the main + UTL_String *main_filename (); // What's the main // file name? void set_main_filename (UTL_String *); // Set it - UTL_String *real_filename (void); // What's the real + UTL_String *real_filename (); // What's the real // file name? void set_real_filename (UTL_String *); // Set it - UTL_String *stripped_filename (void); // Stripped filename + UTL_String *stripped_filename (); // Stripped filename void set_stripped_filename (UTL_String *); // Set it - bool imported (void); // Are we imported? - bool import (void); // Is import on? + bool imported (); // Are we imported? + bool import (); // Is import on? void set_import (bool); // Set it - bool in_main_file (void); // Are we? + bool in_main_file (); // Are we? void set_in_main_file (bool); // Set it - const char *prog_name (void); // Invoked as.. + const char *prog_name (); // Invoked as.. void set_prog_name (const char *); // Set it - const char *cpp_location (void); // Where's CPP? + const char *cpp_location (); // Where's CPP? void set_cpp_location (const char *);// Set it - long compile_flags (void); // What flags are on? + long compile_flags (); // What flags are on? void set_compile_flags (long); // Turn some on or off - char *local_escapes (void); // Get local escapes + char *local_escapes (); // Get local escapes void set_local_escapes (const char *);// Set it - UTL_Indenter *indent (void); // Get indenter + UTL_Indenter *indent (); // Get indenter void set_indent (UTL_Indenter *); // Set it void store_include_file_name (UTL_String *); - UTL_String **include_file_names (void); // Array of file names + UTL_String **include_file_names (); // Array of file names void set_include_file_names (UTL_String **); // Set it - unsigned long n_include_file_names (void); // How many + unsigned long n_include_file_names (); // How many void set_n_include_file_names (unsigned long n); - void reset_flag_seen (void); + void reset_flag_seen (); // = Types & methods supporting DDS DCPS sequence definitions (from #pragma) typedef ACE_Unbounded_Queue<char *> DCPS_Sequence_Types_List; @@ -418,7 +418,7 @@ public: void dcps_support_zero_copy_read (bool value); // BE calls to check the status of zero-copy read support - bool dcps_support_zero_copy_read (void) const; + bool dcps_support_zero_copy_read () const; // FE calls when #pragma DCPS_DATA_SEQUENCE_TYPE is processed void set_dcps_sequence_type (const char* seq_type); @@ -430,7 +430,7 @@ public: void dcps_gen_zero_copy_read (bool value); // BE calls to check the status of zero-copy read support - bool dcps_gen_zero_copy_read (void) const; + bool dcps_gen_zero_copy_read () const; // = Access methods to deal with other IDL files included in the main // IDL file. These IDL files are exactly the same strings that are @@ -441,20 +441,20 @@ public: void add_to_included_idl_files (const char *file_name); // Get all the files. - char** included_idl_files (void); + char** included_idl_files (); // The number of currently availabe include files. - size_t n_included_idl_files (void); + size_t n_included_idl_files (); // Set the number of included_idl_files. Use this carefully. This // method is used when we validate all the #included idl files, // against the ones that we get after preprocessing. void n_included_idl_files (size_t n); - ParseState parse_state (void); // What state we're in + ParseState parse_state (); // What state we're in void set_parse_state (ParseState s); // Set it - UTL_String *idl_src_file (void); + UTL_String *idl_src_file (); // Returns the IDL source file being compiled. void idl_src_file (UTL_String *); @@ -465,7 +465,7 @@ public: // files. By default, IDL compiler looks for TEMP env variable and // if it is not set, "/tmp/" is assigned. - const char *temp_dir (void) const; + const char *temp_dir () const; // Get the directory where the IDL compiler can keep all its temp // files. By default, IDL compiler looks for TEMP env variable and // if it is not set, "/tmp/" is assigned. @@ -473,49 +473,49 @@ public: void tao_root (const char *s); // Set the path of TAO_ROOT. - const char *tao_root (void) const; + const char *tao_root () const; // Get the path for TAO_ROOT. void gperf_path (const char *s); // Set the path for the perfect hashing program (GPERF). - const char *gperf_path (void) const; + const char *gperf_path () const; // Get the path for the perfect hashing program (GPERF). void ident_string (const char *s); // Set the value of the #ident string. - const char *ident_string (void) const; + const char *ident_string () const; // Get the value of the #ident string. void case_diff_error (bool); // report an error (1) for indentifiers in the same scope // that differ only by case, or report a warning (0). - bool case_diff_error (void); + bool case_diff_error (); // are we strict about case-only differences or not? void nest_orb (bool); // Set on or off whether we are using the NEST ORB. - bool nest_orb (void); + bool nest_orb (); // are we beIng used with the NEST ORB? - void destroy (void); + void destroy (); // Cleanup function. void append_idl_flag (const char *s); // Save each flag passed to the IDL compiler. - const char *idl_flags (void) const; + const char *idl_flags () const; // Get a string representation of the flags // passed to the idl compiler. ACE_Hash_Map_Manager<ACE_CString, int, ACE_Null_Mutex> & - idl_keywords (void); + idl_keywords (); // Accessor for the IDL keyword container. - ACE_Unbounded_Stack<char *> & pragma_prefixes (void); + ACE_Unbounded_Stack<char *> & pragma_prefixes (); // Accessor for the pragma prefix container. void update_prefix (char *filename); @@ -524,11 +524,11 @@ public: long seen_include_file_before (char *); // Seen this include before? - long last_seen_index (void) const; + long last_seen_index () const; void last_seen_index (long val); // Accessors for last_seen_index_ member. - bool preserve_cpp_keywords (void); + bool preserve_cpp_keywords (); // Whether we should not mung idl element names that are // C++ keywords e.g. delete, operator etc. with _cxx_ prefix. // Should be true when being used by the IFR Service @@ -543,98 +543,98 @@ public: // specific paths and false for paths provided by user. void add_rel_include_path (const char *s); - ACE_Unbounded_Queue<char *> const & rel_include_paths (void) const; + ACE_Unbounded_Queue<char *> const & rel_include_paths () const; // Accessor/mutator for the rel_include_paths_ member. void add_ciao_lem_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_lem_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_lem_file_names (); // Accessor/mutator for the ciao_lem_file_names_ member. void add_ciao_rti_ts_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_rti_ts_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_rti_ts_file_names (); // Accessor/mutator for the ciao_rti_ts_file_names_ member. void add_ciao_spl_ts_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_spl_ts_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_spl_ts_file_names (); // Accessor/mutator for the ciao_spl_ts_file_names_ member. void add_ciao_oci_ts_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_oci_ts_file_names (); // Accessor/mutator for the ciao_oci_ts_file_names_ member. void add_ciao_coredx_ts_file_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_coredx_ts_file_names (void); + ACE_Unbounded_Queue<char *> & ciao_coredx_ts_file_names (); // Accessor/mutator for the ciao_coredx_ts_file_names_ member. void add_ciao_ami_iface_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_ami_iface_names (void); + ACE_Unbounded_Queue<char *> & ciao_ami_iface_names (); // Accessor/mutator for the ciao_ami_iface_names_ member. void add_ciao_ami_recep_names (const char *s); - ACE_Unbounded_Queue<char *> & ciao_ami_recep_names (void); + ACE_Unbounded_Queue<char *> & ciao_ami_recep_names (); // Accessor/mutator for the ciao_ami_recep_names_ member. void add_included_ami_recep_names (const char *s); - ACE_Unbounded_Queue<char *> & included_ami_recep_names (void); + ACE_Unbounded_Queue<char *> & included_ami_recep_names (); // Accessor/mutator for the included_ami_recep_names_ member. - bool included_ami_receps_done (void) const; + bool included_ami_receps_done () const; void included_ami_receps_done (bool val); void add_ciao_ami_idl_fnames (const char *s); - ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames (void); + ACE_Unbounded_Queue<char *> & ciao_ami_idl_fnames (); // Accessor/mutator for the included_ami_idl_fnames_ member. void add_dds4ccm_impl_fnames (const char *s); - ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames (void); + ACE_Unbounded_Queue<char *> & dds4ccm_impl_fnames (); // Accessor mutator for the dds4ccm_impl_fnames_ member. - ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces (void); + ACE_Unbounded_Queue<AST_Interface *> & mixed_parentage_interfaces (); // Accessor for the member ACE_Hash_Map_Manager<char *, char *, ACE_Null_Mutex> & - file_prefixes (void); + file_prefixes (); // Accessor for the IDL file prefix container. - bool pass_orb_idl (void) const; + bool pass_orb_idl () const; void pass_orb_idl (bool val); // Accessor for the pass_orb_idl_ member. - bool using_ifr_backend (void) const; + bool using_ifr_backend () const; void using_ifr_backend (bool val); // Accessor for the using_ifr_backend_ member. - bool ignore_idl3 (void) const; + bool ignore_idl3 () const; void ignore_idl3 (bool val); // Accessor for the ignore_idl3_ member. - int check_gperf (void); + int check_gperf (); // Currently called only from IDL backend, but could be useful elsewhere. - void fini (void); + void fini (); // Do final cleanup just before process exits. - ACE_Unbounded_Queue<AST_ValueType *> &primary_keys (void); + ACE_Unbounded_Queue<AST_ValueType *> &primary_keys (); // Accessor for the member. - void check_primary_keys (void); + void check_primary_keys (); // Called affer yy_parse() returns - iterates over our list // of primary keys. Must be called this late so that we can // be sure that all forward declared stucts or unions that // might be used in such a valuetype are fully defined. - const char *recursion_start (void) const; + const char *recursion_start () const; void recursion_start (const char *val); // Accessors for the member. - bool multi_file_input (void) const; + bool multi_file_input () const; void multi_file_input (bool val); // Accessors for the member. - const char *big_file_name (void) const; + const char *big_file_name () const; // Just get the const string. - FE_Utils::T_PARAMLIST_INFO const *current_params (void) const; + FE_Utils::T_PARAMLIST_INFO const *current_params () const; void current_params (FE_Utils::T_PARAMLIST_INFO *params); // Accessors for the member. If UTL_Scope::lookup_by_name() // has a 0 result, it will check this param list (if it is not @@ -643,14 +643,14 @@ public: // referenced template parameter of the eclosing template // module. - UTL_StrList const *alias_params (void) const; + UTL_StrList const *alias_params () const; void alias_params (UTL_StrList *params); // Accessors for the member. If we are parsing a template // module reference, we traverse the scope of the referenced // template module, but create param holders with the // alias names. - UTL_StrList const *for_new_holder (void) const; + UTL_StrList const *for_new_holder () const; void for_new_holder (UTL_StrList *params); // Accessors for the member. If a lookup matches something // from current_params(), the actual created param holder must @@ -661,7 +661,7 @@ public: static char* translateName (const char* name, char *name_buf); #endif - AST_Module *corba_module (void) const; + AST_Module *corba_module () const; void corba_module (AST_Module *m); // Accessors for the member. @@ -676,7 +676,7 @@ public: typedef ACE_Unbounded_Queue_Iterator<Include_Path_Info> Unbounded_Paths_Queue_Iterator; - Unbounded_Paths_Queue &include_paths (void); + Unbounded_Paths_Queue &include_paths (); // Accessor for the member. enum ANON_TYPE_DIAGNOSTIC @@ -694,20 +694,20 @@ public: /// Has anon_type_diagnostic () been called? bool explicit_anon_type_diagnostic () const; - bool anon_error (void) const; - bool anon_warning (void) const; - bool anon_silent (void) const; + bool anon_error () const; + bool anon_warning () const; + bool anon_silent () const; // Simple checks for the value of anon_type_diagnostic_. - bool in_typedef (void) const; + bool in_typedef () const; void in_typedef (bool val); // Accessors for the member. - bool in_tmpl_mod_no_alias (void) const; + bool in_tmpl_mod_no_alias () const; void in_tmpl_mod_no_alias (bool val); // Accessors for the member. - bool in_tmpl_mod_alias (void) const; + bool in_tmpl_mod_alias () const; void in_tmpl_mod_alias (bool val); // Accessors for the member. diff --git a/TAO/TAO_IDL/include/utl_decllist.h b/TAO/TAO_IDL/include/utl_decllist.h index 5f0528977bf..ab2818f9bf8 100644 --- a/TAO/TAO_IDL/include/utl_decllist.h +++ b/TAO/TAO_IDL/include/utl_decllist.h @@ -88,10 +88,10 @@ public: UTL_DeclList *cdr); // Get element - FE_Declarator *head (void); + FE_Declarator *head (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // Data @@ -109,7 +109,7 @@ public: UTL_DecllistActiveIterator (UTL_DeclList *s); // Get current item - FE_Declarator *item (void); + FE_Declarator *item (); }; #endif // _UTL_DECLLIST_UTL_DECLLIST_HH diff --git a/TAO/TAO_IDL/include/utl_err.h b/TAO/TAO_IDL/include/utl_err.h index b80970dbe42..4fc0afe033e 100644 --- a/TAO/TAO_IDL/include/utl_err.h +++ b/TAO/TAO_IDL/include/utl_err.h @@ -245,7 +245,7 @@ public: void version_syntax_error (const char *msg); // Repost an attempt to reset the version. - void version_reset_error (void); + void version_reset_error (); // Report an attempt to change the id once set. void id_reset_error (const char *o, @@ -381,7 +381,7 @@ public: // Report illegal infix operator error (they can be used // only with integer, floating point or fixed point expressions. - void illegal_infix (void); + void illegal_infix (); // Report local type used in remote operation. void local_remote_mismatch (AST_Decl *l, @@ -411,7 +411,7 @@ public: AST_Decl *loc); // Error (default) or warning (set by command line option). - void anonymous_type_diagnostic (void); + void anonymous_type_diagnostic (); // Reference to an item in the scope of a template // module was not via an alias. diff --git a/TAO/TAO_IDL/include/utl_exceptlist.h b/TAO/TAO_IDL/include/utl_exceptlist.h index a04f6276994..5ba9bbbcfb7 100644 --- a/TAO/TAO_IDL/include/utl_exceptlist.h +++ b/TAO/TAO_IDL/include/utl_exceptlist.h @@ -84,14 +84,14 @@ public: UTL_ExceptList *cdr); // Get list item. - AST_Type *head (void); + AST_Type *head (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); // Copies the UTL_ExceptList pointers but not the // contained AST_Exceptions. - virtual UTL_ExceptList *copy (void); + virtual UTL_ExceptList *copy (); private: // Data. @@ -106,7 +106,7 @@ public: UTL_ExceptlistActiveIterator (UTL_ExceptList *s); // Get current item - AST_Type *item (void); + AST_Type *item (); }; #endif // _UTL_EXCEPTLIST_UTL_EXCEPTLIST_HH diff --git a/TAO/TAO_IDL/include/utl_exprlist.h b/TAO/TAO_IDL/include/utl_exprlist.h index 3a7f8ebc875..21ff96e039f 100644 --- a/TAO/TAO_IDL/include/utl_exprlist.h +++ b/TAO/TAO_IDL/include/utl_exprlist.h @@ -84,10 +84,10 @@ public: UTL_ExprList *cdr); // Get list item. - AST_Expression *head (void); + AST_Expression *head (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // Data. @@ -101,7 +101,7 @@ public: UTL_ExprlistActiveIterator (UTL_ExprList *s); // Get current item. - AST_Expression *item (void); + AST_Expression *item (); }; #endif // _UTL_EXPRLIST_UTL_EXPRLIST_HH diff --git a/TAO/TAO_IDL/include/utl_identifier.h b/TAO/TAO_IDL/include/utl_identifier.h index bae3e637400..85ceadbf06d 100644 --- a/TAO/TAO_IDL/include/utl_identifier.h +++ b/TAO/TAO_IDL/include/utl_identifier.h @@ -72,7 +72,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc. class TAO_IDL_FE_Export Identifier { public: - Identifier (void); + Identifier (); // Default Constructor. Identifier (const char *s); @@ -80,7 +80,7 @@ public: Identifier (const Identifier &other); - virtual ~Identifier (void); + virtual ~Identifier (); // Destructor. // Operations @@ -89,7 +89,7 @@ public: * Get the underlying string. */ ///{ - char *get_string (void); + char *get_string (); const char *get_string () const; ///} @@ -107,16 +107,16 @@ public: bool case_compare_quiet (Identifier *other); // Like the above but suppressing error or warning I/O - Identifier *copy (void); + Identifier *copy (); // Create a deep copy. - bool escaped (void) const; + bool escaped () const; // Accessor for the member. virtual void dump (ACE_OSTREAM_TYPE &o); // Dump to an ostream. - virtual void destroy (void); + virtual void destroy (); // Cleanup function. bool operator== (const Identifier &other) const; diff --git a/TAO/TAO_IDL/include/utl_idlist.h b/TAO/TAO_IDL/include/utl_idlist.h index ea59e45aca8..a382a35963e 100644 --- a/TAO/TAO_IDL/include/utl_idlist.h +++ b/TAO/TAO_IDL/include/utl_idlist.h @@ -90,25 +90,25 @@ public: UTL_IdList *cdr); // Constructor(s) - virtual ~UTL_IdList (void) {} + virtual ~UTL_IdList () {} // destructor virtual void dump (ACE_OSTREAM_TYPE &o); // Dump to ostream. - virtual void destroy (void); + virtual void destroy (); // Cleanup function. - virtual UTL_IdList *copy (void); + virtual UTL_IdList *copy (); // Copy the list. - Identifier *head (void); + Identifier *head (); // Get element. - Identifier *last_component (void); + Identifier *last_component (); // Get last element in this list. - Identifier *first_component (void); + Identifier *first_component (); // Get first element in this list holding a non-empty string. int compare (UTL_IdList *other); @@ -141,7 +141,7 @@ public: UTL_IdListActiveIterator (UTL_IdList *s); /// Retrieves the next item. - Identifier *item (void); + Identifier *item (); }; #endif // _UTL_IDLIST_UTL_IDLIST_HH diff --git a/TAO/TAO_IDL/include/utl_indenter.h b/TAO/TAO_IDL/include/utl_indenter.h index 8fe36f5b7db..da328055426 100644 --- a/TAO/TAO_IDL/include/utl_indenter.h +++ b/TAO/TAO_IDL/include/utl_indenter.h @@ -78,17 +78,17 @@ class UTL_Indenter // =DESCRIPTION // useful in generating indented output public: - UTL_Indenter (void); + UTL_Indenter (); - ~UTL_Indenter (void) {} + ~UTL_Indenter () {} - void reset (void); + void reset (); // Reset indentation level to 0. - void increase (void); + void increase (); // Increase indentation level. - void decrease (void); + void decrease (); // Decrease indentation level. void skip_to (ACE_OSTREAM_TYPE &o); diff --git a/TAO/TAO_IDL/include/utl_labellist.h b/TAO/TAO_IDL/include/utl_labellist.h index 161b294503f..d2e71a94204 100644 --- a/TAO/TAO_IDL/include/utl_labellist.h +++ b/TAO/TAO_IDL/include/utl_labellist.h @@ -84,13 +84,13 @@ public: UTL_LabelList *cdr); // Get list item. - AST_UnionLabel *head (void); + AST_UnionLabel *head (); // Override of base class method. - virtual UTL_LabelList *copy (void); + virtual UTL_LabelList *copy (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: AST_UnionLabel *pd_car_data; @@ -103,7 +103,7 @@ public: UTL_LabellistActiveIterator (UTL_LabelList *source); // Get current item. - AST_UnionLabel *item (void); + AST_UnionLabel *item (); }; #endif // _UTL_LABELLIST_UTL_LABELLIST_HH diff --git a/TAO/TAO_IDL/include/utl_list.h b/TAO/TAO_IDL/include/utl_list.h index 7e7ed5d781f..a70b9d0ff5d 100644 --- a/TAO/TAO_IDL/include/utl_list.h +++ b/TAO/TAO_IDL/include/utl_list.h @@ -85,25 +85,25 @@ class TAO_IDL_FE_Export UTL_List public: UTL_List (UTL_List *c); - virtual ~UTL_List (void); + virtual ~UTL_List (); // Smash last cdr pointer in "this" with l. void nconc (UTL_List *l); // Copy the list starting at "this". - virtual UTL_List *copy (void); + virtual UTL_List *copy (); // Get next list. - UTL_List *tail (void); + UTL_List *tail (); // Set next list void set_tail (UTL_List *l); // How long is this list? - ACE_CDR::Long length (void); + ACE_CDR::Long length (); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // The next list. @@ -123,13 +123,13 @@ public: UTL_ListActiveIterator (UTL_List *s); - virtual ~UTL_ListActiveIterator (void) {} + virtual ~UTL_ListActiveIterator () {} // Get next list. - virtual void next (void); + virtual void next (); // Are we at the end of this list? - virtual bool is_done (void); + virtual bool is_done (); protected: // On what to iterate? diff --git a/TAO/TAO_IDL/include/utl_namelist.h b/TAO/TAO_IDL/include/utl_namelist.h index 46b946faa5b..2a1d7ab02af 100644 --- a/TAO/TAO_IDL/include/utl_namelist.h +++ b/TAO/TAO_IDL/include/utl_namelist.h @@ -82,14 +82,14 @@ public: UTL_NameList *cdr); // Get list item. - UTL_ScopedName *head (void); + UTL_ScopedName *head (); // Accessors. - bool truncatable (void) const; + bool truncatable () const; void truncatable (bool val); // Cleanup. - virtual void destroy (void); + virtual void destroy (); private: // List item. @@ -106,7 +106,7 @@ public: UTL_NamelistActiveIterator (UTL_NameList *source); // Get current item. - UTL_ScopedName *item (void); + UTL_ScopedName *item (); }; #endif // _UTL_NAMELIST_UTL_NAMELIST_HH diff --git a/TAO/TAO_IDL/include/utl_scope.h b/TAO/TAO_IDL/include/utl_scope.h index 658c2be463b..1b1a5c41e54 100644 --- a/TAO/TAO_IDL/include/utl_scope.h +++ b/TAO/TAO_IDL/include/utl_scope.h @@ -155,14 +155,14 @@ public: // Operations. // Constructor(s). - UTL_Scope (void); + UTL_Scope (); UTL_Scope (AST_Decl::NodeType nt); // Destructor. - virtual ~UTL_Scope (void); + virtual ~UTL_Scope (); // Data Accessors. - AST_Decl::NodeType scope_node_type (void) + AST_Decl::NodeType scope_node_type () { return pd_scope_node_type; } @@ -206,7 +206,7 @@ public: AST_Decl *&final_parent_decl); // How many entries are used? - virtual unsigned long nmembers (void); + virtual unsigned long nmembers (); // If the Identifier string (from the scoped name which has been // already determined to be of length 1) matches a param, @@ -227,11 +227,11 @@ public: void add_to_name_referenced (Identifier *id); // Accessors for the has_prefix_ member. - bool has_prefix (void); + bool has_prefix (); void has_prefix (bool val); // Cleanup function. - virtual void destroy (void); + virtual void destroy (); // Visiting. virtual int ast_accept (ast_visitor *visitor); @@ -533,19 +533,19 @@ public: UTL_Scope::ScopeIterationKind ik); // Advance to next item. - void next (void); + void next (); // Get current item. - AST_Decl *item (void); + AST_Decl *item (); // Have we iterated over entire scope? - bool is_done (void); + bool is_done (); // What kind of iterator is this? - UTL_Scope::ScopeIterationKind iteration_kind (void); + UTL_Scope::ScopeIterationKind iteration_kind (); // What stage are we in with this iterator? - UTL_Scope::ScopeIterationKind iteration_stage (void); + UTL_Scope::ScopeIterationKind iteration_stage (); private: // Scope to iterate over. diff --git a/TAO/TAO_IDL/include/utl_stack.h b/TAO/TAO_IDL/include/utl_stack.h index d83159b6db7..ffc7f909668 100644 --- a/TAO/TAO_IDL/include/utl_stack.h +++ b/TAO/TAO_IDL/include/utl_stack.h @@ -79,35 +79,35 @@ class UTL_ScopeStackActiveIterator; class TAO_IDL_FE_Export UTL_ScopeStack { public: - UTL_ScopeStack (void); - ~UTL_ScopeStack (void); + UTL_ScopeStack (); + ~UTL_ScopeStack (); /// The initial capacity and how much to increment the capacity when needed. static const size_t increments; // Return top element. - UTL_Scope *top (void); + UTL_Scope *top (); // Pop top element. - void pop (void); + void pop (); // Clear entire stack. - void clear (void); + void clear (); // Push an element on the stack and return stack. UTL_ScopeStack *push (UTL_Scope *el); // How deep is the stack now? - unsigned long depth (void); + unsigned long depth (); // Return bottom element. - UTL_Scope *bottom (void); + UTL_Scope *bottom (); // Return (top - 1) element. - UTL_Scope *next_to_top (void); + UTL_Scope *next_to_top (); // return topmost non-NULL element. - UTL_Scope *top_non_null (void); + UTL_Scope *top_non_null (); /** * Call lookup_by_name on all the scopes from the top down. @@ -136,13 +136,13 @@ public: UTL_ScopeStackActiveIterator (UTL_ScopeStack &s); // Advance to next element. - void next (void); + void next (); // Get current item. - UTL_Scope* item (void); + UTL_Scope* item (); // Is the iteration finished? - bool is_done (void) const; + bool is_done () const; private: // On what to iterate? diff --git a/TAO/TAO_IDL/include/utl_string.h b/TAO/TAO_IDL/include/utl_string.h index 9489421c04f..7b6d788df13 100644 --- a/TAO/TAO_IDL/include/utl_string.h +++ b/TAO/TAO_IDL/include/utl_string.h @@ -79,24 +79,24 @@ class TAO_IDL_FE_Export UTL_String // =DESCRIPTION // string class to store identifiers public: - UTL_String (void); + UTL_String (); UTL_String (const char *str, bool take_copy= false); UTL_String (UTL_String *s, bool force_copy= false); - virtual ~UTL_String (void); + virtual ~UTL_String (); - virtual void destroy (void); + virtual void destroy (); // Cleanup function. virtual void dump (ACE_OSTREAM_TYPE &o); // Dump to the ostream. - char *get_string (void) {return this->p_str;} + char *get_string () {return this->p_str;} // Get contents of utl_string. - char *get_canonical_rep (void); + char *get_canonical_rep (); // Get canonical representation. This is (implemented as) the all upper // case corresponding string. diff --git a/TAO/TAO_IDL/include/utl_strlist.h b/TAO/TAO_IDL/include/utl_strlist.h index f355ba746b8..2a6c8f60c5f 100644 --- a/TAO/TAO_IDL/include/utl_strlist.h +++ b/TAO/TAO_IDL/include/utl_strlist.h @@ -84,25 +84,25 @@ public: UTL_StrList (UTL_String *s, UTL_StrList *cdr); - virtual ~UTL_StrList (void); + virtual ~UTL_StrList (); // AST Dumping virtual void dump (ACE_OSTREAM_TYPE &o); // Copy a list of strings - virtual UTL_List *copy (void); + virtual UTL_List *copy (); // Cleanup method. - virtual void destroy (void); + virtual void destroy (); // Get list element - UTL_String *head (void); + UTL_String *head (); // Set the list element void set_head (UTL_String *); // Get last element in this list - UTL_String *last_component (void); + UTL_String *last_component (); private: // The list item @@ -117,7 +117,7 @@ public: UTL_StrlistActiveIterator(UTL_StrList *s); // Get current item. - UTL_String *item (void); + UTL_String *item (); }; #endif // _UTL_STRLIST_UTL_STRLIST_HH diff --git a/TAO/tao/Abstract_Servant_Base.h b/TAO/tao/Abstract_Servant_Base.h index 2fb670808a4..9b53e14563b 100644 --- a/TAO/tao/Abstract_Servant_Base.h +++ b/TAO/tao/Abstract_Servant_Base.h @@ -70,25 +70,25 @@ class TAO_Export TAO_Abstract_ServantBase { public: /// Destructor - virtual ~TAO_Abstract_ServantBase (void); + virtual ~TAO_Abstract_ServantBase (); /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char* logical_type_id) = 0; #if (TAO_HAS_MINIMUM_CORBA == 0) /// Default @c _non_existent: always returns false. - virtual CORBA::Boolean _non_existent (void) = 0; + virtual CORBA::Boolean _non_existent () = 0; #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) /// Query the Interface Repository. - virtual CORBA::InterfaceDef_ptr _get_interface (void) = 0; + virtual CORBA::InterfaceDef_ptr _get_interface () = 0; /// Default @c _get_component: always returns nil. - virtual CORBA::Object_ptr _get_component (void) = 0; + virtual CORBA::Object_ptr _get_component () = 0; #endif /// Default @c _repository_id - virtual char * _repository_id (void) = 0; + virtual char * _repository_id () = 0; #endif /* TAO_HAS_MINIMUM_CORBA */ //@{ @@ -96,21 +96,21 @@ public: * @name Reference Counting Operations */ /// Increase reference count by one. - virtual void _add_ref (void) = 0; + virtual void _add_ref () = 0; /** * Decreases reference count by one; if the resulting reference * count equals zero, _remove_ref invokes delete on its this pointer * in order to destroy the servant. */ - virtual void _remove_ref (void) = 0; + virtual void _remove_ref () = 0; /// Returns the current reference count value. - virtual CORBA::ULong _refcount_value (void) const = 0; + virtual CORBA::ULong _refcount_value () const = 0; //@} /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (void) = 0; + virtual TAO_Stub *_create_stub () = 0; /// Find an operation in the operation table and return a /// TAO_Skeleton which can be used to make upcalls @@ -137,7 +137,7 @@ public: protected: /// Default constructor, only derived classes can be created. - TAO_Abstract_ServantBase (void); + TAO_Abstract_ServantBase (); /// Copy constructor, protected so no instances can be created. TAO_Abstract_ServantBase (const TAO_Abstract_ServantBase &); @@ -157,7 +157,7 @@ protected: TAO::Portable_Server::Servant_Upcall *servant_upcall) = 0; /// Get this interface's repository id (TAO specific). - virtual const char *_interface_repository_id (void) const = 0; + virtual const char *_interface_repository_id () const = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Acceptor_Filter.h b/TAO/tao/Acceptor_Filter.h index d5c4415de3c..1f1f1d095ac 100644 --- a/TAO/tao/Acceptor_Filter.h +++ b/TAO/tao/Acceptor_Filter.h @@ -44,7 +44,7 @@ class TAO_Acceptor; class TAO_Export TAO_Acceptor_Filter { public: - virtual ~TAO_Acceptor_Filter (void); + virtual ~TAO_Acceptor_Filter (); /** * Populate @a mprofile with profiles. Profiles are created for diff --git a/TAO/tao/Acceptor_Registry.h b/TAO/tao/Acceptor_Registry.h index 771982dd41e..dc0124ae18a 100644 --- a/TAO/tao/Acceptor_Registry.h +++ b/TAO/tao/Acceptor_Registry.h @@ -60,10 +60,10 @@ class TAO_Export TAO_Acceptor_Registry { public: /// Default constructor. - TAO_Acceptor_Registry (void); + TAO_Acceptor_Registry (); /// Default destructor. - ~TAO_Acceptor_Registry (void); + ~TAO_Acceptor_Registry (); /// Initialize all registered acceptors. Return -1 on error. int open (TAO_ORB_Core *orb_core, @@ -72,10 +72,10 @@ public: bool ignore_address); /// Close all open acceptors. - int close_all (void); + int close_all (); /// Returns the total number of endpoints in all of its acceptors. - size_t endpoint_count (void); + size_t endpoint_count (); /// Check if there is at least one profile in @a mprofile that /// corresponds to a collocated object. @@ -85,8 +85,8 @@ public: TAO_Acceptor *get_acceptor (CORBA::ULong tag); // = Iterator. - TAO_AcceptorSetIterator begin (void); - TAO_AcceptorSetIterator end (void); + TAO_AcceptorSetIterator begin (); + TAO_AcceptorSetIterator end (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Acceptor_Registry (const TAO_Acceptor_Registry &)) diff --git a/TAO/tao/Adapter.h b/TAO/tao/Adapter.h index 41f12d50af0..e9f0556a7d5 100644 --- a/TAO/tao/Adapter.h +++ b/TAO/tao/Adapter.h @@ -45,10 +45,10 @@ class TAO_ServerRequest; class TAO_Export TAO_Adapter { public: - virtual ~TAO_Adapter (void); + virtual ~TAO_Adapter (); /// Initialize the Adapter - virtual void open (void) = 0; + virtual void open () = 0; /// The ORB is shutting down, destroy any resources attached to this /// adapter. @@ -63,7 +63,7 @@ public: * Adapters at higher priority are used first, the first adapter * that matches a key is used to dispatch a request. */ - virtual int priority (void) const = 0; + virtual int priority () const = 0; /// Return the status.... virtual int dispatch (TAO::ObjectKey &key, @@ -94,14 +94,14 @@ public: /// Return the name, i.e. the object id used to resolve it in the /// ORB. - virtual const char *name (void) const = 0; + virtual const char *name () const = 0; /** * Return the root of the Object Adapter. * Each adapter defines its own IDL interface accessed through the * method above. */ - virtual CORBA::Object_ptr root (void) = 0; + virtual CORBA::Object_ptr root () = 0; /// Create a collocated object using the given profile and stub. virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, diff --git a/TAO/tao/Adapter_Factory.h b/TAO/tao/Adapter_Factory.h index 876864a2240..20105ad3964 100644 --- a/TAO/tao/Adapter_Factory.h +++ b/TAO/tao/Adapter_Factory.h @@ -33,7 +33,7 @@ class TAO_Export TAO_Adapter_Factory : public ACE_Service_Object { public: /// Destructor - virtual ~TAO_Adapter_Factory (void); + virtual ~TAO_Adapter_Factory (); /// Create a new adapter virtual TAO_Adapter *create (TAO_ORB_Core *orb_core) = 0; diff --git a/TAO/tao/Adapter_Registry.h b/TAO/tao/Adapter_Registry.h index 421fc0b234a..037f59e23d2 100644 --- a/TAO/tao/Adapter_Registry.h +++ b/TAO/tao/Adapter_Registry.h @@ -51,7 +51,7 @@ public: explicit TAO_Adapter_Registry (TAO_ORB_Core *); /// Close the - ~TAO_Adapter_Registry (void); + ~TAO_Adapter_Registry (); /** * Close each of of the Adapters and then cleanup the Registry. diff --git a/TAO/tao/Allocator.h b/TAO/tao/Allocator.h index c4b68cd521f..6209d77710e 100644 --- a/TAO/tao/Allocator.h +++ b/TAO/tao/Allocator.h @@ -35,7 +35,7 @@ namespace TAO { public: - virtual ~TAO_Allocator (void) {} + virtual ~TAO_Allocator () {} virtual handler_type *allocate () = 0; virtual void release (handler_type *ptr) = 0; diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode.h b/TAO/tao/AnyTypeCode/Alias_TypeCode.h index d617283dbb0..4b525902eb6 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode.h @@ -66,8 +66,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -82,10 +82,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::TypeCode_ptr content_type_i () const; private: /// Base attributes for this @c TypeCode containing the diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp index 6a89a9dcb7b..48e0a7a074e 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.cpp @@ -57,14 +57,14 @@ TAO::TypeCode::Alias<char const *, void TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -100,7 +100,7 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const + TAO::Null_RefCount_Policy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -132,7 +132,7 @@ TAO::TypeCode::Alias<char const *, char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::id_i (void) const + TAO::Null_RefCount_Policy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -142,7 +142,7 @@ TAO::TypeCode::Alias<char const *, char const * TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -152,7 +152,7 @@ TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr TAO::TypeCode::Alias<char const *, CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::content_type_i (void) const + TAO::Null_RefCount_Policy>::content_type_i () const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h index 05a8f675fac..96c9bac0238 100644 --- a/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Alias_TypeCode_Static.h @@ -69,8 +69,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -85,10 +85,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::TypeCode_ptr content_type_i () const; private: /// Base attributes for this @c TypeCode containing the diff --git a/TAO/tao/AnyTypeCode/Any.cpp b/TAO/tao/AnyTypeCode/Any.cpp index b74124189a3..45e7c8c7c51 100644 --- a/TAO/tao/AnyTypeCode/Any.cpp +++ b/TAO/tao/AnyTypeCode/Any.cpp @@ -23,7 +23,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL using namespace TAO; -CORBA::Any::Any (void) +CORBA::Any::Any () : impl_ (0) { } @@ -37,7 +37,7 @@ CORBA::Any::Any (const CORBA::Any &rhs) } } -CORBA::Any::~Any (void) +CORBA::Any::~Any () { if (this->impl_ != 0) { @@ -80,7 +80,7 @@ CORBA::Any::replace (TAO::Any_Impl *new_impl) } CORBA::TypeCode_ptr -CORBA::Any::type (void) const +CORBA::Any::type () const { if (this->impl_ != 0) { @@ -91,7 +91,7 @@ CORBA::Any::type (void) const } CORBA::TypeCode_ptr -CORBA::Any::_tao_get_typecode (void) const +CORBA::Any::_tao_get_typecode () const { if (this->impl_ != 0) { @@ -116,7 +116,7 @@ CORBA::Any::_tao_set_typecode (const CORBA::TypeCode_ptr tc) } int -CORBA::Any::_tao_byte_order (void) const +CORBA::Any::_tao_byte_order () const { if (this->impl_ != 0) { diff --git a/TAO/tao/AnyTypeCode/Any.h b/TAO/tao/AnyTypeCode/Any.h index 2f644c9ad78..9f879820950 100644 --- a/TAO/tao/AnyTypeCode/Any.h +++ b/TAO/tao/AnyTypeCode/Any.h @@ -66,13 +66,13 @@ namespace CORBA typedef Any_var _var_type; typedef Any_out _out_type; - Any (void); + Any (); Any (const Any &); - ~Any (void); + ~Any (); Any &operator= (const Any &); - TAO::Any_Impl *impl (void) const; + TAO::Any_Impl *impl () const; /// Used in our destruction if we ourselves are stored in an Any. static void _tao_any_destructor (void *); @@ -146,19 +146,19 @@ namespace CORBA void replace (TAO::Any_Impl *); /// Return TypeCode of the element stored in the Any. - TypeCode_ptr type (void) const; + TypeCode_ptr type () const; /// For use along with <<= of a value of aliased type when the alias must /// be preserved. void type (TypeCode_ptr); /// TAO extension, does not return a duplicate. - CORBA::TypeCode_ptr _tao_get_typecode (void) const; + CORBA::TypeCode_ptr _tao_get_typecode () const; /// TAO extension. void _tao_set_typecode (const CORBA::TypeCode_ptr); - int _tao_byte_order (void) const; + int _tao_byte_order () const; private: CORBA::Boolean checked_to_object (CORBA::Object_ptr &) const; @@ -184,10 +184,10 @@ namespace CORBA class TAO_AnyTypeCode_Export Any_var { public: - Any_var (void); + Any_var (); Any_var (Any *a); Any_var (const Any_var &); - ~Any_var (void); + ~Any_var (); Any_var &operator= (Any *); @@ -200,7 +200,7 @@ namespace CORBA Any_var &operator= (const Any_var &); /// Arrow operator (smart pointer). - Any *operator-> (void); + Any *operator-> (); /// Cast. operator const Any *() const; @@ -209,19 +209,19 @@ namespace CORBA operator Any *&(); /// For in Any parameter. - const Any &in (void) const; + const Any &in () const; /// For inout Any parameter. - Any &inout (void); + Any &inout (); /// For out Any parameter. - Any *&out (void); + Any *&out (); /// For Any return type. - Any *_retn (void); + Any *_retn (); /// TAO specific extension - Any *ptr (void) const; + Any *ptr () const; private: /// Holds the Any. Any *ptr_; @@ -252,9 +252,9 @@ namespace CORBA operator Any *&(); /// Return underlying instance. - Any *& ptr (void); + Any *& ptr (); - Any *operator-> (void); + Any *operator-> (); private: /// Assignment from _var disallowed. diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp index cb8beef4ed0..7c9a1911696 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.cpp @@ -287,7 +287,7 @@ TAO_AnyTypeCode_Adapter_Impl::insert_into_any (CORBA::Any * any, const CORBA::WS } int -TAO_AnyTypeCode_Adapter_Impl::Initializer (void) +TAO_AnyTypeCode_Adapter_Impl::Initializer () { // The TAO::Unknown_IDL_Type::lock_i () is a PRIVATE thread unsafe singleton // which we need to initialise before Unknown_IDL_Types are used in a diff --git a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h index ab8c7d6d3f6..566233eb0cf 100644 --- a/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h @@ -32,7 +32,7 @@ class TAO_AnyTypeCode_Export TAO_AnyTypeCode_Adapter_Impl { public: // Used to force the initialization of the code. - static int Initializer (void); + static int Initializer (); #define ANYTYPECODE__EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp index ace666a3009..4d3eb62685a 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.cpp @@ -66,7 +66,7 @@ namespace TAO } } - Any_Basic_Impl::~Any_Basic_Impl (void) + Any_Basic_Impl::~Any_Basic_Impl () { } diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h index ab18778fc0f..c2796c62777 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl.h @@ -40,7 +40,7 @@ namespace TAO Any_Basic_Impl (CORBA::TypeCode_ptr, void *value); - virtual ~Any_Basic_Impl (void); + virtual ~Any_Basic_Impl (); static void insert (CORBA::Any &, CORBA::TypeCode_ptr, diff --git a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h index dd1395d764d..fdd7343bbaf 100644 --- a/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Basic_Impl_T.h @@ -37,7 +37,7 @@ namespace TAO public: Any_Basic_Impl_T (CORBA::TypeCode_ptr, const T & val); - virtual ~Any_Basic_Impl_T (void); + virtual ~Any_Basic_Impl_T (); static void insert (CORBA::Any &, CORBA::TypeCode_ptr, @@ -50,7 +50,7 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; + virtual const void *value () const; static Any_Basic_Impl_T<T> *create_empty (CORBA::TypeCode_ptr); private: diff --git a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h index 4d35f4add89..dd627266355 100644 --- a/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Dual_Impl_T.h @@ -45,7 +45,7 @@ namespace TAO CORBA::TypeCode_ptr, const T &); Any_Dual_Impl_T (CORBA::TypeCode_ptr); - virtual ~Any_Dual_Impl_T (void); + virtual ~Any_Dual_Impl_T (); static void insert (CORBA::Any &, _tao_destructor, @@ -64,8 +64,8 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); protected: void value (const T &); diff --git a/TAO/tao/AnyTypeCode/Any_Impl.cpp b/TAO/tao/AnyTypeCode/Any_Impl.cpp index 3633d68739f..b1867d468e3 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.cpp +++ b/TAO/tao/AnyTypeCode/Any_Impl.cpp @@ -22,7 +22,7 @@ TAO::Any_Impl::Any_Impl (_tao_destructor destructor, { } -TAO::Any_Impl::~Any_Impl (void) +TAO::Any_Impl::~Any_Impl () { } @@ -56,20 +56,20 @@ TAO::Any_Impl::marshal (TAO_OutputCDR &cdr) } void -TAO::Any_Impl::free_value (void) +TAO::Any_Impl::free_value () { // We always have to do this. ::CORBA::release (this->type_); } CORBA::TypeCode_ptr -TAO::Any_Impl::type (void) const +TAO::Any_Impl::type () const { return CORBA::TypeCode::_duplicate (this->type_); } CORBA::TypeCode_ptr -TAO::Any_Impl::_tao_get_typecode (void) const +TAO::Any_Impl::_tao_get_typecode () const { return this->type_; } @@ -82,7 +82,7 @@ TAO::Any_Impl::type (CORBA::TypeCode_ptr tc) } int -TAO::Any_Impl::_tao_byte_order (void) const +TAO::Any_Impl::_tao_byte_order () const { return TAO_ENCAP_BYTE_ORDER; } @@ -102,13 +102,13 @@ TAO::Any_Impl::_tao_any_wstring_destructor (void *x) } void -TAO::Any_Impl::_add_ref (void) +TAO::Any_Impl::_add_ref () { ++this->refcount_; } void -TAO::Any_Impl::_remove_ref (void) +TAO::Any_Impl::_remove_ref () { CORBA::ULong const new_count = --this->refcount_; @@ -145,7 +145,7 @@ TAO::Any_Impl::to_abstract_base (CORBA::AbstractBase_ptr &) const } bool -TAO::Any_Impl::encoded (void) const +TAO::Any_Impl::encoded () const { return this->encoded_; } diff --git a/TAO/tao/AnyTypeCode/Any_Impl.h b/TAO/tao/AnyTypeCode/Any_Impl.h index 2446ec37368..c5682d07878 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl.h +++ b/TAO/tao/AnyTypeCode/Any_Impl.h @@ -69,16 +69,16 @@ namespace TAO CORBA::Boolean marshal (TAO_OutputCDR &); virtual CORBA::Boolean marshal_value (TAO_OutputCDR &) = 0; - virtual void free_value (void); + virtual void free_value (); - CORBA::TypeCode_ptr type (void) const; - CORBA::TypeCode_ptr _tao_get_typecode (void) const; + CORBA::TypeCode_ptr type () const; + CORBA::TypeCode_ptr _tao_get_typecode () const; void type (CORBA::TypeCode_ptr); - virtual int _tao_byte_order (void) const; + virtual int _tao_byte_order () const; - virtual void _add_ref (void); - virtual void _remove_ref (void); + virtual void _add_ref (); + virtual void _remove_ref (); /// Used to release these CORBA basic types. static void _tao_any_string_destructor (void *); @@ -90,13 +90,13 @@ namespace TAO virtual CORBA::Boolean to_value (CORBA::ValueBase *&) const; virtual CORBA::Boolean to_abstract_base (CORBA::AbstractBase_ptr &) const; - bool encoded (void) const; + bool encoded () const; protected: Any_Impl (_tao_destructor, CORBA::TypeCode_ptr, bool encoded = false); - virtual ~Any_Impl (void); + virtual ~Any_Impl (); TAO::Any_Impl::_tao_destructor value_destructor_; CORBA::TypeCode_ptr type_; diff --git a/TAO/tao/AnyTypeCode/Any_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Impl_T.h index 3be4db172f9..c69f916df91 100644 --- a/TAO/tao/AnyTypeCode/Any_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Impl_T.h @@ -43,7 +43,7 @@ namespace TAO Any_Impl_T (_tao_destructor destructor, CORBA::TypeCode_ptr, T * const); - virtual ~Any_Impl_T (void); + virtual ~Any_Impl_T (); static void insert (CORBA::Any &, _tao_destructor destructor, @@ -61,8 +61,8 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR & ); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); private: T * value_; diff --git a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h index 19631ca8c2d..c57d09c7a04 100644 --- a/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h +++ b/TAO/tao/AnyTypeCode/Any_Special_Impl_T.h @@ -37,7 +37,7 @@ namespace TAO CORBA::TypeCode_ptr, T * const, CORBA::ULong bound); - virtual ~Any_Special_Impl_T (void); + virtual ~Any_Special_Impl_T (); static void insert (CORBA::Any &, _tao_destructor destructor, @@ -54,8 +54,8 @@ namespace TAO CORBA::Boolean demarshal_value (TAO_InputCDR &); virtual void _tao_decode (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); private: T * value_; diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.cpp b/TAO/tao/AnyTypeCode/Any_SystemException.cpp index 2e06f71b942..056e90d9531 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.cpp +++ b/TAO/tao/AnyTypeCode/Any_SystemException.cpp @@ -40,7 +40,7 @@ TAO::Any_SystemException::Any_SystemException (CORBA::TypeCode_ptr tc) { } -TAO::Any_SystemException::~Any_SystemException (void) +TAO::Any_SystemException::~Any_SystemException () { } @@ -152,7 +152,7 @@ TAO::Any_SystemException::extract (const CORBA::Any & any, } void -TAO::Any_SystemException::free_value (void) +TAO::Any_SystemException::free_value () { if (this->value_destructor_ != 0) { @@ -165,7 +165,7 @@ TAO::Any_SystemException::free_value (void) } const void * -TAO::Any_SystemException::value (void) const +TAO::Any_SystemException::value () const { return this->value_; } diff --git a/TAO/tao/AnyTypeCode/Any_SystemException.h b/TAO/tao/AnyTypeCode/Any_SystemException.h index 2cb231476f4..622e5e501d4 100644 --- a/TAO/tao/AnyTypeCode/Any_SystemException.h +++ b/TAO/tao/AnyTypeCode/Any_SystemException.h @@ -50,7 +50,7 @@ namespace TAO Any_SystemException (CORBA::TypeCode_ptr); - virtual ~Any_SystemException (void); + virtual ~Any_SystemException (); static void insert (CORBA::Any &, _tao_destructor, @@ -71,8 +71,8 @@ namespace TAO virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); CORBA::Boolean demarshal_value (TAO_InputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); protected: CORBA::SystemException *value_; diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp index 72e818c8ca7..bacd24e67d5 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::Unknown_IDL_Type::LOCK const -TAO::Unknown_IDL_Type::lock_i (void) +TAO::Unknown_IDL_Type::lock_i () { static LOCK base_lock_ (new ACE_Lock_Adapter<TAO_SYNCH_MUTEX>()); return base_lock_; @@ -49,7 +49,7 @@ TAO::Unknown_IDL_Type::Unknown_IDL_Type (CORBA::TypeCode_ptr tc) { } -TAO::Unknown_IDL_Type::~Unknown_IDL_Type (void) +TAO::Unknown_IDL_Type::~Unknown_IDL_Type () { } @@ -81,25 +81,25 @@ TAO::Unknown_IDL_Type::marshal_value (TAO_OutputCDR & cdr) } const void * -TAO::Unknown_IDL_Type::value (void) const +TAO::Unknown_IDL_Type::value () const { return this->cdr_.start (); } void -TAO::Unknown_IDL_Type::free_value (void) +TAO::Unknown_IDL_Type::free_value () { ::CORBA::release (this->type_); } TAO_InputCDR & -TAO::Unknown_IDL_Type::_tao_get_cdr (void) +TAO::Unknown_IDL_Type::_tao_get_cdr () { return this->cdr_; } int -TAO::Unknown_IDL_Type::_tao_byte_order (void) const +TAO::Unknown_IDL_Type::_tao_byte_order () const { return this->cdr_.byte_order (); } diff --git a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h index b313a294ef0..a26f7f02240 100644 --- a/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h +++ b/TAO/tao/AnyTypeCode/Any_Unknown_IDL_Type.h @@ -43,14 +43,14 @@ namespace TAO Unknown_IDL_Type (CORBA::TypeCode_ptr); - virtual ~Unknown_IDL_Type (void); + virtual ~Unknown_IDL_Type (); virtual CORBA::Boolean marshal_value (TAO_OutputCDR &); - virtual const void *value (void) const; - virtual void free_value (void); + virtual const void *value () const; + virtual void free_value (); - virtual TAO_InputCDR &_tao_get_cdr (void); - virtual int _tao_byte_order (void) const; + virtual TAO_InputCDR &_tao_get_cdr (); + virtual int _tao_byte_order () const; virtual void _tao_decode (TAO_InputCDR &); @@ -79,7 +79,7 @@ namespace TAO typedef ACE_Refcounted_Auto_Ptr<ACE_Lock, ACE_Lock_Adapter<TAO_SYNCH_MUTEX> > LOCK; - static LOCK const lock_i (void); + static LOCK const lock_i (); LOCK const lock_; mutable TAO_InputCDR cdr_; }; diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp index 1cf8645c5a2..6792fb8b35f 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.cpp @@ -16,7 +16,7 @@ TAO::TypeCode::Empty_Param::tao_marshal (TAO_OutputCDR &, CORBA::ULong) const } void -TAO::TypeCode::Empty_Param::tao_duplicate (void) +TAO::TypeCode::Empty_Param::tao_duplicate () { // No-op since empty parameter TypeCodes are never created // dynamically, meaning there is no need to implement reference @@ -24,7 +24,7 @@ TAO::TypeCode::Empty_Param::tao_duplicate (void) } void -TAO::TypeCode::Empty_Param::tao_release (void) +TAO::TypeCode::Empty_Param::tao_release () { // No-op since empty parameter TypeCodes are never created // dynamically, meaning there is no need to implement reference @@ -58,7 +58,7 @@ TAO::TypeCode::Empty_Param::equivalent_i (CORBA::TypeCode_ptr tc) const } CORBA::TypeCode_ptr -TAO::TypeCode::Empty_Param::get_compact_typecode_i (void) const +TAO::TypeCode::Empty_Param::get_compact_typecode_i () const { // Already compact since parameter list is empty. diff --git a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h index d0ef4e370c2..ba194eff926 100644 --- a/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Empty_Param_TypeCode.h @@ -60,8 +60,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -76,7 +76,7 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; }; } // End namespace TypeCode diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode.h b/TAO/tao/AnyTypeCode/Enum_TypeCode.h index dbd05818165..245bb43c630 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode.h @@ -63,8 +63,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -78,10 +78,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp index 75fb4ee17c8..81af701debf 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.cpp @@ -58,14 +58,14 @@ TAO::TypeCode::Enum<char const *, void TAO::TypeCode::Enum<char const *, char const * const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Enum<char const *, char const * const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -124,7 +124,7 @@ CORBA::TypeCode_ptr TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<CORBA::String_var> tc_enumerators (this->nenumerators_); @@ -161,7 +161,7 @@ char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -172,7 +172,7 @@ char const * TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::name_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -183,7 +183,7 @@ CORBA::ULong TAO::TypeCode::Enum<char const *, char const * const *, TAO::Null_RefCount_Policy>::member_count_i ( - void) const + ) const { return this->nenumerators_; } diff --git a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h index 8fd342a90ef..4e35dc18586 100644 --- a/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Enum_TypeCode_Static.h @@ -69,8 +69,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -84,10 +84,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h index 56a6b685fa0..e84730b2469 100644 --- a/TAO/tao/AnyTypeCode/Fixed_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Fixed_TypeCode.h @@ -57,8 +57,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -73,9 +73,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::UShort fixed_digits_i (void) const; - virtual CORBA::UShort fixed_scale_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::UShort fixed_digits_i () const; + virtual CORBA::UShort fixed_scale_i () const; private: /// The number of significant digits. diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp index ec34f735087..93a88f1bbc7 100644 --- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.cpp @@ -24,7 +24,7 @@ TAO::TypeCode::Indirected_Type::tao_marshal (TAO_OutputCDR & cdr, } void -TAO::TypeCode::Indirected_Type::tao_duplicate (void) +TAO::TypeCode::Indirected_Type::tao_duplicate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -39,7 +39,7 @@ TAO::TypeCode::Indirected_Type::tao_duplicate (void) } void -TAO::TypeCode::Indirected_Type::tao_release (void) +TAO::TypeCode::Indirected_Type::tao_release () { unsigned long newcount; CORBA::TypeCode_ptr curmaster; @@ -103,25 +103,25 @@ TAO::TypeCode::Indirected_Type::equivalent_i ( } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::get_compact_typecode_i (void) const +TAO::TypeCode::Indirected_Type::get_compact_typecode_i () const { return this->recursive_tc_ ? this->recursive_tc_->get_compact_typecode () : 0; } char const * -TAO::TypeCode::Indirected_Type::id_i (void) const +TAO::TypeCode::Indirected_Type::id_i () const { return this->id_.in (); } char const * -TAO::TypeCode::Indirected_Type::name_i (void) const +TAO::TypeCode::Indirected_Type::name_i () const { return this->recursive_tc_ ? this->recursive_tc_->name () : 0; } CORBA::ULong -TAO::TypeCode::Indirected_Type::member_count_i (void) const +TAO::TypeCode::Indirected_Type::member_count_i () const { return this->recursive_tc_ ? this->recursive_tc_->member_count () : 0; } @@ -147,13 +147,13 @@ TAO::TypeCode::Indirected_Type::member_visibility_i (CORBA::ULong index) const } CORBA::ValueModifier -TAO::TypeCode::Indirected_Type::type_modifier_i (void) const +TAO::TypeCode::Indirected_Type::type_modifier_i () const { return this->recursive_tc_ ? this->recursive_tc_->type_modifier () : 0; } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::concrete_base_type_i (void) const +TAO::TypeCode::Indirected_Type::concrete_base_type_i () const { return this->recursive_tc_ ? this->recursive_tc_->concrete_base_type () : 0; } @@ -165,13 +165,13 @@ TAO::TypeCode::Indirected_Type::member_label_i (CORBA::ULong index) const } CORBA::TypeCode_ptr -TAO::TypeCode::Indirected_Type::discriminator_type_i (void) const +TAO::TypeCode::Indirected_Type::discriminator_type_i () const { return this->recursive_tc_ ? this->recursive_tc_->discriminator_type () : 0; } CORBA::Long -TAO::TypeCode::Indirected_Type::default_index_i (void) const +TAO::TypeCode::Indirected_Type::default_index_i () const { return this->recursive_tc_ ? this->recursive_tc_->default_index () : 0; } diff --git a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h index b72f0d14f2e..4d810a4150a 100644 --- a/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Indirected_Type_TypeCode.h @@ -64,8 +64,8 @@ namespace TAO //@{ virtual bool tao_marshal_kind (TAO_OutputCDR & cdr) const; virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} /// Setter for recursive reference. @@ -83,10 +83,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} @@ -101,8 +101,8 @@ namespace TAO */ //@{ virtual CORBA::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} /** @@ -115,8 +115,8 @@ namespace TAO */ //@{ virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const; - virtual CORBA::ValueModifier type_modifier_i (void) const; - virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const; + virtual CORBA::ValueModifier type_modifier_i () const; + virtual CORBA::TypeCode_ptr concrete_base_type_i () const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Marshal.cpp b/TAO/tao/AnyTypeCode/Marshal.cpp index 965d22e645c..b7274bcd458 100644 --- a/TAO/tao/AnyTypeCode/Marshal.cpp +++ b/TAO/tao/AnyTypeCode/Marshal.cpp @@ -21,7 +21,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Marshal_Object::~TAO_Marshal_Object (void) +TAO_Marshal_Object::~TAO_Marshal_Object () { } diff --git a/TAO/tao/AnyTypeCode/Marshal.h b/TAO/tao/AnyTypeCode/Marshal.h index 09a5705b113..6c6bee37e03 100644 --- a/TAO/tao/AnyTypeCode/Marshal.h +++ b/TAO/tao/AnyTypeCode/Marshal.h @@ -75,10 +75,10 @@ class TAO_AnyTypeCode_Export TAO_Marshal_Object { public: /// constructor - TAO_Marshal_Object (void); + TAO_Marshal_Object (); /// destructor - virtual ~TAO_Marshal_Object (void); + virtual ~TAO_Marshal_Object (); /// skip entry point, it allocates the right kind of Marshal_Object /// and invokes skip on it. @@ -111,7 +111,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Primitive: public TAO_Marshal_Object { public: - TAO_Marshal_Primitive (void); + TAO_Marshal_Primitive (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -133,7 +133,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Any: public TAO_Marshal_Object { public: - TAO_Marshal_Any (void); + TAO_Marshal_Any (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -155,7 +155,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_TypeCode: public TAO_Marshal_Object { public: - TAO_Marshal_TypeCode (void); + TAO_Marshal_TypeCode (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -177,7 +177,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Principal: public TAO_Marshal_Object { public: - TAO_Marshal_Principal (void); + TAO_Marshal_Principal (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -199,7 +199,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_ObjRef: public TAO_Marshal_Object { public: - TAO_Marshal_ObjRef (void); + TAO_Marshal_ObjRef (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -221,7 +221,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Struct : public TAO_Marshal_Object { public: - TAO_Marshal_Struct (void); + TAO_Marshal_Struct (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -243,7 +243,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Union: public TAO_Marshal_Object { public: - TAO_Marshal_Union (void); + TAO_Marshal_Union (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -265,7 +265,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_String: public TAO_Marshal_Object { public: - TAO_Marshal_String (void); + TAO_Marshal_String (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -287,7 +287,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Sequence: public TAO_Marshal_Object { public: - TAO_Marshal_Sequence (void); + TAO_Marshal_Sequence (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -309,7 +309,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Array: public TAO_Marshal_Object { public: - TAO_Marshal_Array (void); + TAO_Marshal_Array (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -331,7 +331,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Alias: public TAO_Marshal_Object { public: - TAO_Marshal_Alias (void); + TAO_Marshal_Alias (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -353,7 +353,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Except: public TAO_Marshal_Object { public: - TAO_Marshal_Except (void); + TAO_Marshal_Except (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -375,7 +375,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_WString : public TAO_Marshal_Object { public: - TAO_Marshal_WString (void); + TAO_Marshal_WString (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, @@ -397,7 +397,7 @@ public: class TAO_AnyTypeCode_Export TAO_Marshal_Value: public TAO_Marshal_Object { public: - TAO_Marshal_Value (void); + TAO_Marshal_Value (); /// skip operation virtual TAO::traverse_status skip (CORBA::TypeCode_ptr tc, diff --git a/TAO/tao/AnyTypeCode/Marshal.inl b/TAO/tao/AnyTypeCode/Marshal.inl index 281a0225f2f..54d26c68102 100644 --- a/TAO/tao/AnyTypeCode/Marshal.inl +++ b/TAO/tao/AnyTypeCode/Marshal.inl @@ -3,77 +3,77 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE -TAO_Marshal_Object::TAO_Marshal_Object (void) +TAO_Marshal_Object::TAO_Marshal_Object () { } ACE_INLINE -TAO_Marshal_Primitive::TAO_Marshal_Primitive (void) +TAO_Marshal_Primitive::TAO_Marshal_Primitive () { } ACE_INLINE -TAO_Marshal_Any::TAO_Marshal_Any (void) +TAO_Marshal_Any::TAO_Marshal_Any () { } ACE_INLINE -TAO_Marshal_Principal::TAO_Marshal_Principal (void) +TAO_Marshal_Principal::TAO_Marshal_Principal () { } ACE_INLINE -TAO_Marshal_TypeCode::TAO_Marshal_TypeCode (void) +TAO_Marshal_TypeCode::TAO_Marshal_TypeCode () { } ACE_INLINE -TAO_Marshal_ObjRef::TAO_Marshal_ObjRef (void) +TAO_Marshal_ObjRef::TAO_Marshal_ObjRef () { } ACE_INLINE -TAO_Marshal_Struct::TAO_Marshal_Struct (void) +TAO_Marshal_Struct::TAO_Marshal_Struct () { } ACE_INLINE -TAO_Marshal_Union::TAO_Marshal_Union (void) +TAO_Marshal_Union::TAO_Marshal_Union () { } ACE_INLINE -TAO_Marshal_String::TAO_Marshal_String (void) +TAO_Marshal_String::TAO_Marshal_String () { } ACE_INLINE -TAO_Marshal_Sequence::TAO_Marshal_Sequence (void) +TAO_Marshal_Sequence::TAO_Marshal_Sequence () { } ACE_INLINE -TAO_Marshal_Array::TAO_Marshal_Array (void) +TAO_Marshal_Array::TAO_Marshal_Array () { } ACE_INLINE -TAO_Marshal_Alias::TAO_Marshal_Alias (void) +TAO_Marshal_Alias::TAO_Marshal_Alias () { } ACE_INLINE -TAO_Marshal_Except::TAO_Marshal_Except (void) +TAO_Marshal_Except::TAO_Marshal_Except () { } ACE_INLINE -TAO_Marshal_WString::TAO_Marshal_WString (void) +TAO_Marshal_WString::TAO_Marshal_WString () { } ACE_INLINE -TAO_Marshal_Value::TAO_Marshal_Value (void) +TAO_Marshal_Value::TAO_Marshal_Value () : nested_processing_ (false) { } diff --git a/TAO/tao/AnyTypeCode/NVList.cpp b/TAO/tao/AnyTypeCode/NVList.cpp index 927ae22006c..61f86f31d40 100644 --- a/TAO/tao/AnyTypeCode/NVList.cpp +++ b/TAO/tao/AnyTypeCode/NVList.cpp @@ -23,13 +23,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Reference counting for DII Request object CORBA::ULong -CORBA::NamedValue::_incr_refcount (void) +CORBA::NamedValue::_incr_refcount () { return ++this->refcount_; } CORBA::ULong -CORBA::NamedValue::_decr_refcount (void) +CORBA::NamedValue::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; @@ -39,7 +39,7 @@ CORBA::NamedValue::_decr_refcount (void) return new_count; } -CORBA::NamedValue::~NamedValue (void) +CORBA::NamedValue::~NamedValue () { if (this->name_) { @@ -52,13 +52,13 @@ CORBA::NamedValue::~NamedValue (void) // **************************************************************** CORBA::ULong -CORBA::NVList::_incr_refcount (void) +CORBA::NVList::_incr_refcount () { return ++this->refcount_; } CORBA::ULong -CORBA::NVList::_decr_refcount (void) +CORBA::NVList::_decr_refcount () { CORBA::ULong const new_count = --this->refcount_; @@ -68,7 +68,7 @@ CORBA::NVList::_decr_refcount (void) return new_count; } -CORBA::NVList::~NVList (void) +CORBA::NVList::~NVList () { // initialize an iterator and delete each NamedValue ACE_Unbounded_Queue_Iterator<CORBA::NamedValue_ptr> iter (this->values_); @@ -402,7 +402,7 @@ CORBA::NVList::_tao_decode (TAO_InputCDR &incoming, int flag) } ptrdiff_t -CORBA::NVList::_tao_target_alignment (void) +CORBA::NVList::_tao_target_alignment () { ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, ace_mon, @@ -426,7 +426,7 @@ CORBA::NVList::_tao_target_alignment (void) } void -CORBA::NVList::evaluate (void) +CORBA::NVList::evaluate () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -444,7 +444,7 @@ CORBA::NVList::evaluate (void) } CORBA::Boolean -CORBA::NVList::_lazy_has_arguments (void) const +CORBA::NVList::_lazy_has_arguments () const { if (this->incoming_ != 0) { diff --git a/TAO/tao/AnyTypeCode/NVList.h b/TAO/tao/AnyTypeCode/NVList.h index 001a1d7691d..0516647be45 100644 --- a/TAO/tao/AnyTypeCode/NVList.h +++ b/TAO/tao/AnyTypeCode/NVList.h @@ -84,21 +84,21 @@ namespace CORBA public: /// optional name - const char * name (void) const; + const char * name () const; /// return the value - Any_ptr value (void) const; + Any_ptr value () const; /// return the parameter mode flag - Flags flags (void) const; + Flags flags () const; // The pseudo object static methods.. static NamedValue * _duplicate (NamedValue *); - static NamedValue * _nil (void); + static NamedValue * _nil (); // = Reference counting. - ULong _incr_refcount (void); - ULong _decr_refcount (void); + ULong _incr_refcount (); + ULong _decr_refcount (); // Useful for template programming. typedef NamedValue_ptr _ptr_type; @@ -111,12 +111,12 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~NamedValue (void); + ~NamedValue (); private: /// private constructor. Cannot be directly instantiated other than /// by its friends. - NamedValue (void); + NamedValue (); private: /// Reference counter. @@ -165,7 +165,7 @@ namespace CORBA public: /// return the current number of elements in the list - ULong count (void) const; + ULong count () const; /// add an element and just initialize the flags NamedValue_ptr add (Flags); @@ -193,11 +193,11 @@ namespace CORBA // The pseudo object static methods.. static NVList * _duplicate (NVList *); - static NVList * _nil (void); + static NVList * _nil (); // = Reference counting. - ULong _incr_refcount (void); - ULong _decr_refcount (void); + ULong _incr_refcount (); + ULong _decr_refcount (); // = TAO Extensions: @@ -223,14 +223,14 @@ namespace CORBA * re-alignment. * It returns ACE_CDR::MAX_ALIGNMENT to indicate errors. */ - ptrdiff_t _tao_target_alignment (void); + ptrdiff_t _tao_target_alignment (); /** * If this list is used by a DII request, this will tell us if * our CDR stream contains any marshaled arguments (needed for * GIOP 1.2). */ - Boolean _lazy_has_arguments (void) const; + Boolean _lazy_has_arguments () const; // Useful for template programming. typedef NVList_ptr _ptr_type; @@ -243,12 +243,12 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~NVList (void); + ~NVList (); private: /// Constructor - cannot be instantiated directly other than /// through the CORBA::ORB::create_list method - NVList (void); + NVList (); /// Helper to increase the list size. This is used by all the add_ /// methods of the NVList class @@ -256,7 +256,7 @@ namespace CORBA /// Lazy evaluation routine to fill up the Anys in the NVList from /// the CDR stream. - void evaluate (void); + void evaluate (); private: /// Internal list of parameters stored as NamedValues diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp index d170907e390..a9d1940a8df 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.cpp @@ -55,7 +55,7 @@ TAO_NVList_Adapter_Impl::create_named_value (CORBA::NamedValue_ptr &nv) } int -TAO_NVList_Adapter_Impl::Initializer (void) +TAO_NVList_Adapter_Impl::Initializer () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_NVList_Adapter_Impl); } diff --git a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h index aca4292e926..5ad1d79264e 100644 --- a/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h +++ b/TAO/tao/AnyTypeCode/NVList_Adapter_Impl.h @@ -36,7 +36,7 @@ public: virtual void create_named_value (CORBA::NamedValue_ptr &nv); /// Used to force the initialization of the NVList adapter - static int Initializer (void); + static int Initializer (); }; static int TAO_Requires_NVList_Adapter_Impl_Initializer = diff --git a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h index 09b696a606c..6dd3b5e1fa0 100644 --- a/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/Null_RefCount_Policy.h @@ -66,10 +66,10 @@ namespace TAO public: /// No-op reference increment. - void add_ref (void) { } + void add_ref () { } /// No-op reference decrement. - void remove_ref (void) { } + void remove_ref () { } }; diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode.h b/TAO/tao/AnyTypeCode/Objref_TypeCode.h index 59e1abf4e3c..5a43981c0f2 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode.h @@ -69,8 +69,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -86,9 +86,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; protected: /// Base attributes (@c id and @c name). diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp index 2502e71169d..9022c9ce878 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.cpp @@ -38,13 +38,13 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::tao_marshal ( void TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -70,7 +70,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr TAO::TypeCode::Objref<char const *, - TAO::Null_RefCount_Policy>::get_compact_typecode_i (void) const + TAO::Null_RefCount_Policy>::get_compact_typecode_i () const { TAO_TypeCodeFactory_Adapter * const adapter = ACE_Dynamic_Service<TAO_TypeCodeFactory_Adapter>::instance ( @@ -116,7 +116,7 @@ TAO::TypeCode::Objref<char const *, char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -125,7 +125,7 @@ TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::id_i ( char const * TAO::TypeCode::Objref<char const *, TAO::Null_RefCount_Policy>::name_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. diff --git a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h index 0887c074809..8166b24edbe 100644 --- a/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Objref_TypeCode_Static.h @@ -73,8 +73,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -90,9 +90,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; protected: /// Base attributes (@c id and @c name). diff --git a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h index 403529e8650..d8482d33599 100644 --- a/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Recursive_Type_TypeCode.h @@ -143,7 +143,7 @@ namespace TAO { public: Reset (CORBA::ULong & flag) : flag_ (flag) { } - ~Reset (void) { this->flag_ = 0; } + ~Reset () { this->flag_ = 0; } private: CORBA::ULong & flag_; }; diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h index 9b621ac9bd3..154a4d41742 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode.h @@ -60,8 +60,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -76,9 +76,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; + virtual CORBA::TypeCode_ptr content_type_i () const; private: /// Element type of the sequence. diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp index 99f8e26c3bf..5ef1aec82db 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.cpp @@ -48,13 +48,13 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, void TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } void TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -105,7 +105,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // Already compact since tk_sequence and tk_array TypeCodes have no // name or member names, meaning that we can simply call @@ -126,7 +126,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::ULong TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::length_i ( - void) const + ) const { return this->length_; } @@ -134,7 +134,7 @@ TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, CORBA::TypeCode_ptr TAO::TypeCode::Sequence<CORBA::TypeCode_ptr const *, TAO::Null_RefCount_Policy>::content_type_i ( - void) const + ) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h index 2750c37ab74..11c76119774 100644 --- a/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Sequence_TypeCode_Static.h @@ -65,8 +65,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -81,9 +81,9 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; - virtual CORBA::TypeCode_ptr content_type_i ( void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; + virtual CORBA::TypeCode_ptr content_type_i ( ) const; private: /// Element type of the sequence. diff --git a/TAO/tao/AnyTypeCode/String_TypeCode.h b/TAO/tao/AnyTypeCode/String_TypeCode.h index 507ad7ba137..8ca53f95e6e 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode.h @@ -59,8 +59,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -75,8 +75,8 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; private: /// Length of the @c string. A length of zero indicates an diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp index 90b9344e529..83f28c3add9 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.cpp @@ -24,12 +24,12 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_marshal ( } void -TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate (void) +TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_duplicate () { } void -TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release (void) +TAO::TypeCode::String<TAO::Null_RefCount_Policy>::tao_release () { } @@ -57,7 +57,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::equivalent_i ( CORBA::TypeCode_ptr TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // Already compact since tk_string and tk_wstring TypeCodes have no // name or member names, meaning that we can simply call @@ -71,7 +71,7 @@ TAO::TypeCode::String<TAO::Null_RefCount_Policy>::get_compact_typecode_i ( CORBA::ULong TAO::TypeCode::String<TAO::Null_RefCount_Policy>::length_i ( - void) const + ) const { return this->length_; } diff --git a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h index 8fb262cb65d..388644be81b 100644 --- a/TAO/tao/AnyTypeCode/String_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/String_TypeCode_Static.h @@ -62,8 +62,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -78,8 +78,8 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual CORBA::ULong length_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual CORBA::ULong length_i () const; private: /// Length of the @c string. A length of zero indicates an diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode.h b/TAO/tao/AnyTypeCode/Struct_TypeCode.h index 3234062e624..4e5fb375edf 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode.h @@ -72,8 +72,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} /// Accessor for fields_ @@ -91,10 +91,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp index 212bd380a39..fb6853c958e 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.cpp @@ -83,7 +83,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -92,7 +92,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -181,7 +181,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<Struct_Field<CORBA::String_var, CORBA::TypeCode_var> > @@ -229,7 +229,7 @@ TAO::TypeCode::Struct<char const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -241,7 +241,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -253,7 +253,7 @@ TAO::TypeCode::Struct<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Struct_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->nfields_; } diff --git a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h index aa800a6b537..06bbd178928 100644 --- a/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Struct_TypeCode_Static.h @@ -78,8 +78,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -94,10 +94,10 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; //@} diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp index 3f25a04ed14..97662a84f02 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::True_RefCount_Policy::~True_RefCount_Policy (void) +TAO::True_RefCount_Policy::~True_RefCount_Policy () { } diff --git a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h index e1198f14cbe..d21e261cf3d 100644 --- a/TAO/tao/AnyTypeCode/True_RefCount_Policy.h +++ b/TAO/tao/AnyTypeCode/True_RefCount_Policy.h @@ -75,7 +75,7 @@ namespace TAO public: /// Increase the reference count on this object. - void add_ref (void); + void add_ref (); /// Decrease the reference count on this object. /** @@ -83,7 +83,7 @@ namespace TAO * reference count drops to zero, call @c operator @c delete() * on this object. */ - void remove_ref (void); + void remove_ref (); protected: /// Constructor. @@ -91,7 +91,7 @@ namespace TAO * @note This constructor is protected since it not meant to be * instantiated/used as a standalone object. */ - True_RefCount_Policy (void); + True_RefCount_Policy (); /// Destructor. /** @@ -100,7 +100,7 @@ namespace TAO * zero, i.e. when @c remove_ref() calls @c operator * @c delete @c this. */ - virtual ~True_RefCount_Policy (void); + virtual ~True_RefCount_Policy (); private: /// Reference counter. diff --git a/TAO/tao/AnyTypeCode/TypeCode.cpp b/TAO/tao/AnyTypeCode/TypeCode.cpp index b8277a895cc..53108bd3b91 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -CORBA::TypeCode::~TypeCode (void) +CORBA::TypeCode::~TypeCode () { } @@ -113,19 +113,19 @@ CORBA::TypeCode::equivalent (TypeCode_ptr tc) const } char const * -CORBA::TypeCode::id_i (void) const +CORBA::TypeCode::id_i () const { throw ::CORBA::TypeCode::BadKind (); } char const * -CORBA::TypeCode::name_i (void) const +CORBA::TypeCode::name_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::ULong -CORBA::TypeCode::member_count_i (void) const +CORBA::TypeCode::member_count_i () const { throw ::CORBA::TypeCode::BadKind (); } @@ -149,37 +149,37 @@ CORBA::TypeCode::member_label_i (CORBA::ULong /* index */) const } CORBA::TypeCode_ptr -CORBA::TypeCode::discriminator_type_i (void) const +CORBA::TypeCode::discriminator_type_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::Long -CORBA::TypeCode::default_index_i (void) const +CORBA::TypeCode::default_index_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::ULong -CORBA::TypeCode::length_i (void) const +CORBA::TypeCode::length_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::TypeCode_ptr -CORBA::TypeCode::content_type_i (void) const +CORBA::TypeCode::content_type_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::UShort -CORBA::TypeCode::fixed_digits_i (void) const +CORBA::TypeCode::fixed_digits_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::UShort -CORBA::TypeCode::fixed_scale_i (void) const +CORBA::TypeCode::fixed_scale_i () const { throw ::CORBA::TypeCode::BadKind (); } @@ -191,20 +191,20 @@ CORBA::TypeCode::member_visibility_i (CORBA::ULong /* index */) const } CORBA::ValueModifier -CORBA::TypeCode::type_modifier_i (void) const +CORBA::TypeCode::type_modifier_i () const { throw ::CORBA::TypeCode::BadKind (); } CORBA::TypeCode_ptr -CORBA::TypeCode::concrete_base_type_i (void) const +CORBA::TypeCode::concrete_base_type_i () const { throw ::CORBA::TypeCode::BadKind (); } // --------------------------------------------------------------- -CORBA::TypeCode::Bounds::Bounds (void) +CORBA::TypeCode::Bounds::Bounds () : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/Bounds:1.0", "Bounds") { @@ -217,7 +217,7 @@ CORBA::TypeCode::Bounds::_downcast (CORBA::Exception *ex) } CORBA::Exception * -CORBA::TypeCode::Bounds::_alloc (void) +CORBA::TypeCode::Bounds::_alloc () { CORBA::Exception *retval = 0; ACE_NEW_RETURN (retval, ::CORBA::TypeCode::Bounds, 0); @@ -225,7 +225,7 @@ CORBA::TypeCode::Bounds::_alloc (void) } CORBA::Exception * -CORBA::TypeCode::Bounds::_tao_duplicate (void) const +CORBA::TypeCode::Bounds::_tao_duplicate () const { CORBA::Exception *result; ACE_NEW_RETURN (result, @@ -235,7 +235,7 @@ CORBA::TypeCode::Bounds::_tao_duplicate (void) const } void -CORBA::TypeCode::Bounds::_raise (void) const +CORBA::TypeCode::Bounds::_raise () const { throw *this; } @@ -258,7 +258,7 @@ CORBA::TypeCode::Bounds::_tao_decode (TAO_InputCDR &) // **************************************************************** -CORBA::TypeCode::BadKind::BadKind (void) +CORBA::TypeCode::BadKind::BadKind () : CORBA::UserException ("IDL:omg.org/CORBA/TypeCode/BadKind:1.0", "BadKind") { @@ -271,7 +271,7 @@ CORBA::TypeCode::BadKind::_downcast (CORBA::Exception *ex) } CORBA::Exception * -CORBA::TypeCode::BadKind::_tao_duplicate (void) const +CORBA::TypeCode::BadKind::_tao_duplicate () const { CORBA::Exception *result = 0; ACE_NEW_RETURN (result, @@ -281,7 +281,7 @@ CORBA::TypeCode::BadKind::_tao_duplicate (void) const } void -CORBA::TypeCode::BadKind::_raise (void) const +CORBA::TypeCode::BadKind::_raise () const { throw *this; } @@ -402,7 +402,7 @@ namespace TAO } CORBA::TypeCode_ptr - Objref_Traits<CORBA::TypeCode>::nil (void) + Objref_Traits<CORBA::TypeCode>::nil () { return CORBA::TypeCode::_nil (); } diff --git a/TAO/tao/AnyTypeCode/TypeCode.h b/TAO/tao/AnyTypeCode/TypeCode.h index d7701ab1c50..9a21085a314 100644 --- a/TAO/tao/AnyTypeCode/TypeCode.h +++ b/TAO/tao/AnyTypeCode/TypeCode.h @@ -70,14 +70,14 @@ namespace CORBA public: /// Constructor. - Bounds (void); + Bounds (); static Bounds * _downcast (CORBA::Exception * ex); - static CORBA::Exception * _alloc (void); + static CORBA::Exception * _alloc (); - virtual CORBA::Exception * _tao_duplicate (void) const; + virtual CORBA::Exception * _tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR & cdr) const; virtual void _tao_decode (TAO_InputCDR & cdr); @@ -96,14 +96,14 @@ namespace CORBA { public: - BadKind (void); + BadKind (); static BadKind * _downcast (CORBA::Exception * ex); - static CORBA::Exception * _alloc (void); + static CORBA::Exception * _alloc (); - virtual CORBA::Exception * _tao_duplicate (void) const; + virtual CORBA::Exception * _tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR & cdr) const; virtual void _tao_decode (TAO_InputCDR & cdr); @@ -123,7 +123,7 @@ namespace CORBA static CORBA::TypeCode_ptr _duplicate (CORBA::TypeCode_ptr tc); /// Returns a NULL typecode. - static CORBA::TypeCode_ptr _nil (void); + static CORBA::TypeCode_ptr _nil (); /** * @name @c CORBA::TypeCode Methods @@ -158,7 +158,7 @@ namespace CORBA Boolean equivalent (TypeCode_ptr tc) const; /// The kind of @c TypeCode. - TCKind kind (void) const; + TCKind kind () const; /// Return @c TypeCode stripped of optional @c name and /// @c member_name fields. @@ -180,7 +180,7 @@ namespace CORBA * the TAO_IDL compiler by invoking it with its "-Gt" * (i.e. enable optimized TypeCodes) command line option. */ - TypeCode_ptr get_compact_typecode (void) const; + TypeCode_ptr get_compact_typecode () const; /// The @c RepositoryId globally identifying the type. /** @@ -206,7 +206,7 @@ namespace CORBA * is required by the C++ mapping. In particular, ownership * is maintained by the @c TypeCode. */ - char const * id (void) const; + char const * id () const; /// The simple name identifying the type within its enclosing /// scope. @@ -233,7 +233,7 @@ namespace CORBA * behavior is required by the C++ mapping. In particular, * ownership is maintained by the @c TypeCode. */ - char const * name (void) const; + char const * name () const; /// The type member count. /** @@ -246,7 +246,7 @@ namespace CORBA * @li @c tk_except * @li @c tk_event */ - ULong member_count (void) const; + ULong member_count () const; /// The type member name. /** @@ -292,7 +292,7 @@ namespace CORBA * * @li @c tk_union */ - TypeCode_ptr discriminator_type (void) const; + TypeCode_ptr discriminator_type () const; /// The index of the default union member. /** @@ -300,7 +300,7 @@ namespace CORBA * * @li @c tk_union */ - Long default_index (void) const; + Long default_index () const; /// The length of the type. /** @@ -311,7 +311,7 @@ namespace CORBA * @li @c tk_sequence * @li @c tk_array */ - ULong length (void) const; + ULong length () const; /// The underlying content type. /** @@ -322,7 +322,7 @@ namespace CORBA * @li @c tk_value_box * @li @c tk_alias */ - TypeCode_ptr content_type (void) const; + TypeCode_ptr content_type () const; /// The number of significant digits. /** @@ -330,7 +330,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_digits (void) const; + UShort fixed_digits () const; /// The scale factor. /** @@ -338,7 +338,7 @@ namespace CORBA * * @li @c tk_fixed */ - UShort fixed_scale (void) const; + UShort fixed_scale () const; /// The @c Visibility of the @c valuetype or @c eventtype member /// corresponding to index @a index. @@ -358,7 +358,7 @@ namespace CORBA * @li @c tk_value * @li @c tk_event */ - ValueModifier type_modifier (void) const; + ValueModifier type_modifier () const; /// The @c TypeCode corresponding to the concrete base /// @c valuetype or @c eventtype. @@ -372,7 +372,7 @@ namespace CORBA * @c valuetype or @c eventtype. * @c CORBA::TypeCode::_nil() if no concrete base exists. */ - TypeCode_ptr concrete_base_type (void) const; + TypeCode_ptr concrete_base_type () const; //@} /// Marshal the @c TypeCode @c TCKind. @@ -411,10 +411,10 @@ namespace CORBA CORBA::ULong offset) const = 0; /// Increase the reference count on this @c TypeCode. - virtual void tao_duplicate (void) = 0; + virtual void tao_duplicate () = 0; /// Decrease the reference count on this object. - virtual void tao_release (void) = 0; + virtual void tao_release () = 0; /// Destruction callback for Anys. static void _tao_any_destructor (void * x); @@ -432,7 +432,7 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - virtual ~TypeCode (void); + virtual ~TypeCode (); /** * @name @c TypeCode Template Methods @@ -453,23 +453,23 @@ namespace CORBA //@{ virtual Boolean equal_i (TypeCode_ptr tc) const = 0; virtual Boolean equivalent_i (TypeCode_ptr tc) const = 0; - virtual TypeCode_ptr get_compact_typecode_i (void) const = 0; + virtual TypeCode_ptr get_compact_typecode_i () const = 0; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual ULong member_count_i (void) const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual ULong member_count_i () const; virtual char const * member_name_i (ULong index) const; virtual TypeCode_ptr member_type_i (ULong index) const; virtual Any * member_label_i (ULong index) const; - virtual TypeCode_ptr discriminator_type_i (void) const; - virtual Long default_index_i (void) const; - virtual ULong length_i (void) const; - virtual TypeCode_ptr content_type_i (void) const; - virtual UShort fixed_digits_i (void) const; - virtual UShort fixed_scale_i (void) const; + virtual TypeCode_ptr discriminator_type_i () const; + virtual Long default_index_i () const; + virtual ULong length_i () const; + virtual TypeCode_ptr content_type_i () const; + virtual UShort fixed_digits_i () const; + virtual UShort fixed_scale_i () const; virtual Visibility member_visibility_i (ULong index) const; - virtual ValueModifier type_modifier_i (void) const; - virtual TypeCode_ptr concrete_base_type_i (void) const; + virtual ValueModifier type_modifier_i () const; + virtual TypeCode_ptr concrete_base_type_i () const; //@} private: @@ -549,7 +549,7 @@ namespace TAO { static ::CORBA::TypeCode_ptr duplicate (::CORBA::TypeCode_ptr); static void release (::CORBA::TypeCode_ptr); - static ::CORBA::TypeCode_ptr nil (void); + static ::CORBA::TypeCode_ptr nil (); static CORBA::Boolean marshal (::CORBA::TypeCode_ptr p, TAO_OutputCDR & cdr); }; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h index 1616339555c..193de495ea3 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Base_Attributes.h @@ -51,11 +51,11 @@ namespace TAO Base_Attributes (char const * id); /// Get the @c RepositoryId globally identifying the type. - char const * id (void) const; + char const * id () const; /// Get the simple name identifying the type within its /// enclosing scope. - char const * name (void) const; + char const * name () const; /// Set the simple name identifying the type within its /// enclosing scope. diff --git a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp index b3d656e61cb..e80e1c653a4 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp +++ b/TAO/tao/AnyTypeCode/TypeCode_CDR_Extraction.cpp @@ -44,7 +44,7 @@ namespace TAO struct TC_Info { /// Constructor. - TC_Info (void) : id (0), type () {} + TC_Info () : id (0), type () {} /// Repository ID. char const * id; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h index da96f1360cd..1e420b17592 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Base_T.h @@ -60,20 +60,20 @@ namespace TAO /** * Constructor used when creating dynamic @c union @c TypeCodes. */ - Case (void); + Case (); /// Destructor. - virtual ~Case (void); + virtual ~Case (); /// Cloning/copying operation. - virtual Case * clone (void) const = 0; + virtual Case * clone () const = 0; /// Return the IDL @c union case label value embedded within a /// @c CORBA::Any. - virtual CORBA::Any * label (void) const = 0; + virtual CORBA::Any * label () const = 0; /// Get the name of the @c union case/member. - char const * name (void) const; + char const * name () const; /// Set the name of the @c union case/member. void name (char const * the_name); @@ -83,7 +83,7 @@ namespace TAO * @note The reference count is not manipulated by this method, * i.e., ownership is retained by this class. */ - CORBA::TypeCode_ptr type (void) const; + CORBA::TypeCode_ptr type () const; /// Set the @c CORBA::TypeCode of the @c union case/member. /** diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h index de360a3cdcb..b44435db95f 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_Enum_T.h @@ -71,8 +71,8 @@ namespace TAO * @see @c TAO::TypeCode::Case */ //@{ - Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (void) const; + Case<StringType, TypeCodeType> * clone () const; + virtual CORBA::Any * label () const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc) const; diff --git a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h index d6ab4a1ab36..973edcffb32 100644 --- a/TAO/tao/AnyTypeCode/TypeCode_Case_T.h +++ b/TAO/tao/AnyTypeCode/TypeCode_Case_T.h @@ -108,8 +108,8 @@ namespace TAO * @see @c TAO::TypeCode::Case */ //@{ - Case<StringType, TypeCodeType> * clone (void) const; - virtual CORBA::Any * label (void) const; + Case<StringType, TypeCodeType> * clone () const; + virtual CORBA::Any * label () const; virtual bool marshal_label (TAO_OutputCDR & cdr) const; virtual bool equal_label (CORBA::ULong index, CORBA::TypeCode_ptr tc) const; diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode.h b/TAO/tao/AnyTypeCode/Union_TypeCode.h index 31855ed90a4..99cc7cf771a 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode.h @@ -76,12 +76,12 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} /// Accessor for cases_ - const CaseArrayType& cases(void) const; + const CaseArrayType& cases() const; protected: /** @@ -94,15 +94,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp index 14193893e5e..d702bec5bfc 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.cpp @@ -78,7 +78,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -87,7 +87,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -198,7 +198,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { // typedef ACE::Value_Ptr<TAO::TypeCode::Case<CORBA::String_var, // CORBA::TypeCode_var> > elem_type; @@ -253,7 +253,7 @@ TAO::TypeCode::Union<char const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, TAO::Null_RefCount_Policy>::id_i ( - void) const + ) const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -265,7 +265,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -277,7 +277,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->ncases_; } @@ -352,7 +352,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::discriminator_type_i (void) const + TAO::Null_RefCount_Policy>::discriminator_type_i () const { return CORBA::TypeCode::_duplicate ( @@ -364,7 +364,7 @@ TAO::TypeCode::Union<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Case<char const *, CORBA::TypeCode_ptr const *> const * const *, - TAO::Null_RefCount_Policy>::default_index_i (void) const + TAO::Null_RefCount_Policy>::default_index_i () const { return this->default_index_; } diff --git a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h index 180747f1428..e624fcbece0 100644 --- a/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Union_TypeCode_Static.h @@ -80,8 +80,8 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -95,15 +95,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Any * member_label_i (CORBA::ULong index) const; - virtual CORBA::TypeCode_ptr discriminator_type_i (void) const; - virtual CORBA::Long default_index_i (void) const; + virtual CORBA::TypeCode_ptr discriminator_type_i () const; + virtual CORBA::Long default_index_i () const; //@} private: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode.h b/TAO/tao/AnyTypeCode/Value_TypeCode.h index c454d0cbe1a..836403fd08d 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode.h @@ -76,12 +76,12 @@ namespace TAO //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} /// Accessor for concrete_base_ - const TypeCodeType& concrete_base(void) const; + const TypeCodeType& concrete_base() const; /// Accessor for fields_ const FieldArrayType& fields() const; @@ -98,15 +98,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const; - virtual CORBA::ValueModifier type_modifier_i (void) const; - virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const; + virtual CORBA::ValueModifier type_modifier_i () const; + virtual CORBA::TypeCode_ptr concrete_base_type_i () const; //@} protected: diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp index 311b8f541a8..54d40980a78 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.cpp @@ -87,7 +87,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_duplicate (void) + TAO::Null_RefCount_Policy>::tao_duplicate () { } @@ -96,7 +96,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::tao_release (void) + TAO::Null_RefCount_Policy>::tao_release () { } @@ -224,7 +224,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::get_compact_typecode_i ( - void) const + ) const { ACE_Array_Base<Value_Field<CORBA::String_var, CORBA::TypeCode_var> > tc_fields (this->nfields_); @@ -275,7 +275,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::id_i (void) const + TAO::Null_RefCount_Policy>::id_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -287,7 +287,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::name_i (void) const + TAO::Null_RefCount_Policy>::name_i () const { // Ownership is retained by the TypeCode, as required by the C++ // mapping. @@ -299,7 +299,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::member_count_i (void) const + TAO::Null_RefCount_Policy>::member_count_i () const { return this->nfields_; } @@ -355,7 +355,7 @@ TAO::TypeCode::Value<char const *, CORBA::TypeCode_ptr const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, - TAO::Null_RefCount_Policy>::type_modifier_i (void) const + TAO::Null_RefCount_Policy>::type_modifier_i () const { return this->type_modifier_; } @@ -366,7 +366,7 @@ TAO::TypeCode::Value<char const *, TAO::TypeCode::Value_Field<char const *, CORBA::TypeCode_ptr const *> const *, TAO::Null_RefCount_Policy>::concrete_base_type_i ( - void) const + ) const { return CORBA::TypeCode::_duplicate ( diff --git a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h index b159728edb8..e269498b648 100644 --- a/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h +++ b/TAO/tao/AnyTypeCode/Value_TypeCode_Static.h @@ -79,8 +79,8 @@ namespace TAO */ //@{ virtual bool tao_marshal (TAO_OutputCDR & cdr, CORBA::ULong offset) const; - virtual void tao_duplicate (void); - virtual void tao_release (void); + virtual void tao_duplicate (); + virtual void tao_release (); //@} protected: @@ -95,15 +95,15 @@ namespace TAO //@{ virtual CORBA::Boolean equal_i (CORBA::TypeCode_ptr tc) const; virtual CORBA::Boolean equivalent_i (CORBA::TypeCode_ptr tc) const; - virtual CORBA::TypeCode_ptr get_compact_typecode_i (void) const; - virtual char const * id_i (void) const; - virtual char const * name_i (void) const; - virtual CORBA::ULong member_count_i (void) const; + virtual CORBA::TypeCode_ptr get_compact_typecode_i () const; + virtual char const * id_i () const; + virtual char const * name_i () const; + virtual CORBA::ULong member_count_i () const; virtual char const * member_name_i (CORBA::ULong index) const; virtual CORBA::TypeCode_ptr member_type_i (CORBA::ULong index) const; virtual CORBA::Visibility member_visibility_i (CORBA::ULong index) const; - virtual CORBA::ValueModifier type_modifier_i (void) const; - virtual CORBA::TypeCode_ptr concrete_base_type_i (void) const; + virtual CORBA::ValueModifier type_modifier_i () const; + virtual CORBA::TypeCode_ptr concrete_base_type_i () const; //@} private: diff --git a/TAO/tao/AnyTypeCode_Adapter.h b/TAO/tao/AnyTypeCode_Adapter.h index 395fdb7df83..e7e793c952c 100644 --- a/TAO/tao/AnyTypeCode_Adapter.h +++ b/TAO/tao/AnyTypeCode_Adapter.h @@ -62,7 +62,7 @@ class TAO_Export TAO_AnyTypeCode_Adapter : public ACE_Service_Object { public: - virtual ~TAO_AnyTypeCode_Adapter (void); + virtual ~TAO_AnyTypeCode_Adapter (); #define ANYTYPECODE__EXCEPTION_LIST \ TAO_SYSTEM_EXCEPTION (UNKNOWN) \ diff --git a/TAO/tao/Argument.h b/TAO/tao/Argument.h index 96b084c29b5..f47baa2a74f 100644 --- a/TAO/tao/Argument.h +++ b/TAO/tao/Argument.h @@ -51,7 +51,7 @@ namespace TAO public: /// Destructor. - virtual ~Argument (void); + virtual ~Argument (); /// Marshal the argument into the given CDR output stream. /** @@ -66,7 +66,7 @@ namespace TAO virtual CORBA::Boolean demarshal (TAO_InputCDR &); /// Template method to clone a TAO Argument - virtual Argument* clone (void); + virtual Argument* clone (); #if TAO_HAS_INTERCEPTORS == 1 @@ -86,7 +86,7 @@ namespace TAO virtual void interceptor_value (CORBA::Any *) const; /// Get the parameter mode of this argument - virtual CORBA::ParameterMode mode (void) const = 0; + virtual CORBA::ParameterMode mode () const = 0; //@} #endif /* TAO_HAS_INTERCEPTORS == 1 */ @@ -97,7 +97,7 @@ namespace TAO class TAO_Export InArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument InArgument; @@ -107,7 +107,7 @@ namespace TAO class TAO_Export InoutArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument InoutArgument; @@ -117,7 +117,7 @@ namespace TAO class TAO_Export OutArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument OutArgument; @@ -127,7 +127,7 @@ namespace TAO class TAO_Export RetArgument : public Argument { public: - virtual CORBA::ParameterMode mode (void) const; + virtual CORBA::ParameterMode mode () const; }; #else typedef Argument RetArgument; @@ -136,7 +136,7 @@ namespace TAO class TAO_Export Void_Return_Argument : public RetArgument { public: - virtual Argument* clone (void); + virtual Argument* clone (); }; } diff --git a/TAO/tao/Array_Traits_T.h b/TAO/tao/Array_Traits_T.h index 086cd3eacc1..33a79646a44 100644 --- a/TAO/tao/Array_Traits_T.h +++ b/TAO/tao/Array_Traits_T.h @@ -37,7 +37,7 @@ struct array_traits TAO::Array_Traits<forany_type>::free (value); } - inline static slice_type * alloc (void) + inline static slice_type * alloc () { return TAO::Array_Traits<forany_type>::alloc (); } diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 294c0c21a37..78ac9ed7eff 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -49,10 +49,10 @@ public: typedef T_slice _slice_type; typedef TAG _tag_type; - TAO_Array_Forany_T (void); + TAO_Array_Forany_T (); TAO_Array_Forany_T (_slice_type *, CORBA::Boolean nocopy = false); TAO_Array_Forany_T (const TAO_Array_Forany_T<T,T_slice,TAG> &); - ~TAO_Array_Forany_T (void); + ~TAO_Array_Forany_T (); static void _tao_any_destructor (void *); @@ -72,14 +72,14 @@ public: typedef _slice_type *& _retn_arg_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); - _slice_type * ptr (void) const; - CORBA::Boolean nocopy (void) const; - - static _slice_type * tao_alloc (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); + _slice_type * ptr () const; + CORBA::Boolean nocopy () const; + + static _slice_type * tao_alloc (); private: typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY; _slice_type * ptr_; @@ -99,10 +99,10 @@ public: typedef T_slice const & _const_subscript_type; typedef T_slice & _subscript_type; - TAO_Array_Var_Base_T (void); + TAO_Array_Var_Base_T (); TAO_Array_Var_Base_T (_slice_type *); TAO_Array_Var_Base_T (const TAO_Array_Var_Base_T<T,T_slice,TAG> &); - ~TAO_Array_Var_Base_T (void); + ~TAO_Array_Var_Base_T (); _subscript_type operator[] (CORBA::ULong index); _const_subscript_type operator[] (CORBA::ULong index) const; @@ -114,13 +114,13 @@ public: typedef _slice_type *& _retn_arg_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _retn_type _retn (void); - _retn_arg_type _retn_arg (void); + _in_type in () const; + _inout_type inout (); + _retn_type _retn (); + _retn_arg_type _retn_arg (); // TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: typedef TAO_Array_Forany_T<T,T_slice,TAG> FORANY; _slice_type * ptr_; @@ -139,7 +139,7 @@ public: typedef T_slice _slice_type; typedef T_slice *_out_type; - TAO_FixedArray_Var_T (void); + TAO_FixedArray_Var_T (); TAO_FixedArray_Var_T (_slice_type *); TAO_FixedArray_Var_T (const TAO_FixedArray_Var_T<T,T_slice,TAG> &); @@ -147,7 +147,7 @@ public: TAO_FixedArray_Var_T<T,T_slice,TAG> &operator= ( const TAO_FixedArray_Var_T<T,T_slice,TAG> &); - _out_type out (void); + _out_type out (); private: // Some compilers don't look into the base class when parsing @@ -168,7 +168,7 @@ public: typedef T_slice _slice_type; typedef T_slice *&_out_type; - TAO_VarArray_Var_T (void); + TAO_VarArray_Var_T (); TAO_VarArray_Var_T (_slice_type *); TAO_VarArray_Var_T (const TAO_VarArray_Var_T<T,T_slice,TAG> &); @@ -176,7 +176,7 @@ public: TAO_VarArray_Var_T<T,T_slice,TAG> &operator= ( const TAO_VarArray_Var_T<T,T_slice,TAG> &); - _out_type out (void); + _out_type out (); operator _slice_type *& (); @@ -208,7 +208,7 @@ public: TAO_Array_Out_T<T,T_var,T_slice,TAG> &operator= (_slice_type *); operator _slice_type *& (); - _slice_type *& ptr (void); + _slice_type *& ptr (); _slice_type & operator[] (CORBA::ULong index); const _slice_type & operator[] (CORBA::ULong index) const; diff --git a/TAO/tao/Asynch_Reply_Dispatcher_Base.h b/TAO/tao/Asynch_Reply_Dispatcher_Base.h index ca07c546f93..ada4e29eacb 100644 --- a/TAO/tao/Asynch_Reply_Dispatcher_Base.h +++ b/TAO/tao/Asynch_Reply_Dispatcher_Base.h @@ -70,11 +70,11 @@ public: * Why are we clumping everything in one method. Answer is we need * atomicity? */ - bool try_dispatch_reply (void); + bool try_dispatch_reply (); protected: /// Destructor. - virtual ~TAO_Asynch_Reply_Dispatcher_Base (void); + virtual ~TAO_Asynch_Reply_Dispatcher_Base (); private: void operator= (const TAO_Asynch_Reply_Dispatcher_Base &); diff --git a/TAO/tao/Basic_Argument_T.h b/TAO/tao/Basic_Argument_T.h index 8af4f039df8..806620dc950 100644 --- a/TAO/tao/Basic_Argument_T.h +++ b/TAO/tao/Basic_Argument_T.h @@ -39,7 +39,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S arg (void) const; + S arg () const; protected: S const & x_; @@ -58,9 +58,9 @@ namespace TAO { public: In_Basic_Clonable_Argument_T (S const & x); - virtual ~In_Basic_Clonable_Argument_T (void); + virtual ~In_Basic_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -84,7 +84,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -107,7 +107,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -124,16 +124,16 @@ namespace TAO class Ret_Basic_Argument_T : public RetArgument { public: - Ret_Basic_Argument_T (void); + Ret_Basic_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); - S excp (void); - S retn (void); + S excp (); + S retn (); private: S x_; diff --git a/TAO/tao/Bind_Dispatcher_Guard.h b/TAO/tao/Bind_Dispatcher_Guard.h index 13ffed795ee..d1e26eedb8b 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.h +++ b/TAO/tao/Bind_Dispatcher_Guard.h @@ -29,10 +29,10 @@ public: TAO_Reply_Dispatcher* rd, TAO_Transport_Mux_Strategy* tms); - ~TAO_Bind_Dispatcher_Guard (void); + ~TAO_Bind_Dispatcher_Guard (); /// Returns 0 if successful and non-zero otherwise. - int unbind_dispatcher (void); + int unbind_dispatcher (); /// State information enum TAO_Bind_Dispatcher_Status @@ -44,7 +44,7 @@ public: }; /// Get status - TAO_Bind_Dispatcher_Status status (void) const; + TAO_Bind_Dispatcher_Status status () const; /// Set status void status (TAO_Bind_Dispatcher_Status status); diff --git a/TAO/tao/Bind_Dispatcher_Guard.inl b/TAO/tao/Bind_Dispatcher_Guard.inl index 3068dfd7608..f38bc197f40 100644 --- a/TAO/tao/Bind_Dispatcher_Guard.inl +++ b/TAO/tao/Bind_Dispatcher_Guard.inl @@ -22,13 +22,13 @@ TAO_Bind_Dispatcher_Guard::status (TAO_Bind_Dispatcher_Status s) } ACE_INLINE TAO_Bind_Dispatcher_Guard::TAO_Bind_Dispatcher_Status -TAO_Bind_Dispatcher_Guard::status (void) const +TAO_Bind_Dispatcher_Guard::status () const { return this->status_; } ACE_INLINE int -TAO_Bind_Dispatcher_Guard::unbind_dispatcher (void) +TAO_Bind_Dispatcher_Guard::unbind_dispatcher () { int const retval = this->tms_->unbind_dispatcher (this->request_id_); diff --git a/TAO/tao/Bounded_Basic_String_Sequence_T.h b/TAO/tao/Bounded_Basic_String_Sequence_T.h index b3c667e962a..a249e9110ff 100644 --- a/TAO/tao/Bounded_Basic_String_Sequence_T.h +++ b/TAO/tao/Bounded_Basic_String_Sequence_T.h @@ -37,7 +37,7 @@ public: typedef details::generic_sequence<value_type, allocation_traits, element_traits> implementation_type; // @copydoc TAO::details::generic_sequence::generic_sequence() - inline bounded_basic_string_sequence(void) + inline bounded_basic_string_sequence() : impl_() {} // @copydoc TAO::details::generic_sequence::generic_sequence() diff --git a/TAO/tao/Buffer_Allocator_T.h b/TAO/tao/Buffer_Allocator_T.h index bed4622609c..723de777a9e 100644 --- a/TAO/tao/Buffer_Allocator_T.h +++ b/TAO/tao/Buffer_Allocator_T.h @@ -39,7 +39,7 @@ namespace TAO typedef alloc_type ALLOC_TYPE; TAO_Buffer_Allocator (alloc_type *allocator); - virtual handler_type *allocate (void); + virtual handler_type *allocate (); virtual void release (handler_type *ptr); private: alloc_type* allocator_; diff --git a/TAO/tao/CDR.h b/TAO/tao/CDR.h index 3efeca9a5ca..16d1d0eaa83 100644 --- a/TAO/tao/CDR.h +++ b/TAO/tao/CDR.h @@ -163,7 +163,7 @@ public: ACE_CDR::Octet minor_version = TAO_DEF_GIOP_MINOR); /// Destructor. - ~TAO_OutputCDR (void); + ~TAO_OutputCDR (); // @todo do we want a special method to write an array of // strings and wstrings? @@ -190,7 +190,7 @@ public: ACE_CDR::ULong pending_length); /// Are there more data fragments to come? - bool more_fragments (void) const; + bool more_fragments () const; /// Specify whether there are more data fragments to come. void more_fragments (bool more); @@ -202,16 +202,16 @@ public: ACE_Time_Value * timeout); /// Fragmented message request ID. - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Stub object associated with the request. - TAO_Stub * stub (void) const; + TAO_Stub * stub () const; /// Message semantics (twoway, oneway, reply) - TAO_Message_Semantics message_semantics (void) const; + TAO_Message_Semantics message_semantics () const; /// Maximum time to wait for outgoing message to be sent. - ACE_Time_Value * timeout (void) const; + ACE_Time_Value * timeout () const; //@} /// These methods are used by valuetype indirection support. @@ -414,12 +414,12 @@ public: #endif /* ACE_HAS_CPP11 */ /// Destructor - virtual ~TAO_InputCDR (void); + virtual ~TAO_InputCDR (); // = TAO specific methods. /// Accessor - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; ACE_Message_Block::Message_Flags clr_mb_flags( ACE_Message_Block::Message_Flags less_flags ); diff --git a/TAO/tao/CORBA_String.h b/TAO/tao/CORBA_String.h index 81dd555f150..5e308bc9ad2 100644 --- a/TAO/tao/CORBA_String.h +++ b/TAO/tao/CORBA_String.h @@ -52,7 +52,7 @@ namespace TAO typedef TAO::details::string_traits_base <character_type> s_traits; /// Default constructor. - inline String_var (void) : ptr_ (0) + inline String_var () : ptr_ (0) { } @@ -72,7 +72,7 @@ namespace TAO } /// Destructor. - inline ~String_var (void) + inline ~String_var () { s_traits::release (this->ptr_); } @@ -128,19 +128,19 @@ namespace TAO } /// For in parameter. - inline const character_type *in (void) const + inline const character_type *in () const { return this->ptr_; } /// For inout parameter. - inline character_type *&inout (void) + inline character_type *&inout () { return this->ptr_; } /// For out parameter. - inline character_type *&out (void) + inline character_type *&out () { s_traits::release (this->ptr_); this->ptr_ = 0; @@ -148,7 +148,7 @@ namespace TAO } /// For string of return type. - inline character_type *_retn (void) + inline character_type *_retn () { character_type *temp = this->ptr_; this->ptr_ = 0; @@ -225,7 +225,7 @@ namespace TAO } /// Return underlying instance. - inline character_type *&ptr (void) + inline character_type *&ptr () { return this->ptr_; } diff --git a/TAO/tao/Cache_Entries_T.cpp b/TAO/tao/Cache_Entries_T.cpp index e047a890c89..2b3bd726512 100644 --- a/TAO/tao/Cache_Entries_T.cpp +++ b/TAO/tao/Cache_Entries_T.cpp @@ -25,7 +25,7 @@ namespace TAO } template <typename TRANSPORT_TYPE> - Cache_IntId_T<TRANSPORT_TYPE>::~Cache_IntId_T (void) + Cache_IntId_T<TRANSPORT_TYPE>::~Cache_IntId_T () { if (this->transport_) this->transport_->remove_reference (); diff --git a/TAO/tao/Cache_Entries_T.h b/TAO/tao/Cache_Entries_T.h index a4762e34cc8..ed391738a38 100644 --- a/TAO/tao/Cache_Entries_T.h +++ b/TAO/tao/Cache_Entries_T.h @@ -65,7 +65,7 @@ namespace TAO typedef TRANSPORT_TYPE transport_type; /// Constructor. - Cache_IntId_T (void); + Cache_IntId_T (); /// Constructor. Cache_IntId_T (transport_type *transport); @@ -74,7 +74,7 @@ namespace TAO Cache_IntId_T (const Cache_IntId_T & rhs); /// Destructor. - ~Cache_IntId_T (void); + ~Cache_IntId_T (); /// Assignment operator (does copy memory). Cache_IntId_T& operator= (const Cache_IntId_T &rhs); @@ -86,16 +86,16 @@ namespace TAO bool operator!= (const Cache_IntId_T &rhs) const; /// Return the underlying transport - transport_type *transport (void); + transport_type *transport (); /// Return the underlying transport - const transport_type *transport (void) const; + const transport_type *transport () const; /// Set recycle_state. void recycle_state (Cache_Entries_State new_state); /// Get recycle_state. - Cache_Entries_State recycle_state (void) const; + Cache_Entries_State recycle_state () const; /// Relinquish ownership of the TAO_Transport object associated with /// this Cache_IntId_T. @@ -106,10 +106,10 @@ namespace TAO * This method really only exists to get around inadequacies * in the Transport_Cache_Map_Manager interface. */ - transport_type *relinquish_transport (void); + transport_type *relinquish_transport (); /// Get the connected flag - bool is_connected (void) const; + bool is_connected () const; /// Set the connected flag void is_connected (bool connected); @@ -144,7 +144,7 @@ namespace TAO typedef TRANSPORT_DESCRIPTOR_TYPE transport_descriptor_type; /// Constructor. - Cache_ExtId_T (void); + Cache_ExtId_T (); /// Constructor. explicit Cache_ExtId_T (transport_descriptor_type *prop); @@ -153,7 +153,7 @@ namespace TAO Cache_ExtId_T (const Cache_ExtId_T & rhs); /// Destructor. - ~Cache_ExtId_T (void); + ~Cache_ExtId_T (); // = Assignment and comparison operators. /// Assignment operator (does copy memory). @@ -167,24 +167,24 @@ namespace TAO /// hash function is required in order for this class to be usable by /// ACE_Hash_Map_Manager_Ex. - u_long hash (void) const; + u_long hash () const; /// Make a deep copy of the underlying pointer - void duplicate (void); + void duplicate (); /// Return the index value - CORBA::ULong index (void) const; + CORBA::ULong index () const; /// Set the index value. This calls should not be used by any users /// but for the TAO_Transport_Cache_Manager class. void index (CORBA::ULong index); /// Increment the index value - void incr_index (void); + void incr_index (); // = Accessors /// Get the underlying the property pointer - transport_descriptor_type *property (void) const; + transport_descriptor_type *property () const; private: /// A property object that we represent. diff --git a/TAO/tao/Cache_Entries_T.inl b/TAO/tao/Cache_Entries_T.inl index 1b4121eef81..411c7d0e0ff 100644 --- a/TAO/tao/Cache_Entries_T.inl +++ b/TAO/tao/Cache_Entries_T.inl @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { template <typename TRANSPORT_TYPE> ACE_INLINE - Cache_IntId_T<TRANSPORT_TYPE>::Cache_IntId_T (void) + Cache_IntId_T<TRANSPORT_TYPE>::Cache_IntId_T () : transport_ (0), recycle_state_ (ENTRY_UNKNOWN), is_connected_ (false) @@ -37,21 +37,21 @@ namespace TAO template <typename TRANSPORT_TYPE> ACE_INLINE typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::transport (void) + Cache_IntId_T<TRANSPORT_TYPE>::transport () { return this->transport_; } template <typename TRANSPORT_TYPE> ACE_INLINE const typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::transport (void) const + Cache_IntId_T<TRANSPORT_TYPE>::transport () const { return this->transport_; } template <typename TRANSPORT_TYPE> ACE_INLINE bool - Cache_IntId_T<TRANSPORT_TYPE>::is_connected (void) const + Cache_IntId_T<TRANSPORT_TYPE>::is_connected () const { return this->is_connected_; } @@ -64,14 +64,14 @@ namespace TAO } template <typename TRANSPORT_TYPE> ACE_INLINE Cache_Entries_State - Cache_IntId_T<TRANSPORT_TYPE>::recycle_state (void) const + Cache_IntId_T<TRANSPORT_TYPE>::recycle_state () const { return this->recycle_state_; } template <typename TRANSPORT_TYPE> ACE_INLINE typename Cache_IntId_T<TRANSPORT_TYPE>::transport_type * - Cache_IntId_T<TRANSPORT_TYPE>::relinquish_transport (void) + Cache_IntId_T<TRANSPORT_TYPE>::relinquish_transport () { // Yield ownership of the TAO_Transport object. transport_type *val = this->transport_; @@ -98,7 +98,7 @@ namespace TAO /*******************************************************/ template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::Cache_ExtId_T (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::Cache_ExtId_T () : transport_property_ (0), is_delete_ (false), index_ (0) @@ -116,7 +116,7 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::~Cache_ExtId_T (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::~Cache_ExtId_T () { if (this->is_delete_) delete this->transport_property_; @@ -173,13 +173,13 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE u_long - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::hash (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::hash () const { return (this->transport_property_->hash () + this->index_); } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE void - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::duplicate (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::duplicate () { transport_descriptor_type *prop = 0; @@ -199,7 +199,7 @@ namespace TAO template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE CORBA::ULong - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::index (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::index () const { return this->index_; } @@ -212,14 +212,14 @@ namespace TAO } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE void - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::incr_index (void) + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::incr_index () { ++this->index_; } template <typename TRANSPORT_DESCRIPTOR_TYPE> ACE_INLINE typename Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::transport_descriptor_type * - Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::property (void) const + Cache_ExtId_T<TRANSPORT_DESCRIPTOR_TYPE>::property () const { return this->transport_property_; } diff --git a/TAO/tao/Cleanup_Func_Registry.h b/TAO/tao/Cleanup_Func_Registry.h index f3b02cd4b4c..0970e3a39cd 100644 --- a/TAO/tao/Cleanup_Func_Registry.h +++ b/TAO/tao/Cleanup_Func_Registry.h @@ -40,10 +40,10 @@ class TAO_Export TAO_Cleanup_Func_Registry public: /// Constructor. - TAO_Cleanup_Func_Registry (void); + TAO_Cleanup_Func_Registry (); /// Return the number of registered cleanup functions. - size_t size (void) const; + size_t size () const; protected: /// Register a cleanup function. The number of slot the cleanup diff --git a/TAO/tao/ClientRequestInterceptor_Adapter.h b/TAO/tao/ClientRequestInterceptor_Adapter.h index 3ada82f83da..67f3e884033 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter.h @@ -63,7 +63,7 @@ namespace TAO : public RequestInterceptor_Adapter { public: - virtual ~ClientRequestInterceptor_Adapter (void); + virtual ~ClientRequestInterceptor_Adapter (); /** * @name PortableInterceptor Client Side Interception Points diff --git a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h index 0ca15b73e70..0f514b2e3d1 100644 --- a/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ClientRequestInterceptor_Adapter_Factory.h @@ -40,9 +40,9 @@ class TAO_Export TAO_ClientRequestInterceptor_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_ClientRequestInterceptor_Adapter_Factory (void); + virtual ~TAO_ClientRequestInterceptor_Adapter_Factory (); - virtual TAO::ClientRequestInterceptor_Adapter *create (void) = 0; + virtual TAO::ClientRequestInterceptor_Adapter *create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Client_Strategy_Factory.h b/TAO/tao/Client_Strategy_Factory.h index 6ff11c9df61..e59d0ee66ee 100644 --- a/TAO/tao/Client_Strategy_Factory.h +++ b/TAO/tao/Client_Strategy_Factory.h @@ -58,16 +58,16 @@ class TAO_Export TAO_Client_Strategy_Factory : public ACE_Service_Object public: /// Destructor - virtual ~TAO_Client_Strategy_Factory (void); + virtual ~TAO_Client_Strategy_Factory (); /// Create the correct client request muxing strategy. virtual TAO_Transport_Mux_Strategy *create_transport_mux_strategy (TAO_Transport *transport) = 0; /// Create the correct lock for request muxing strategy. - virtual ACE_Lock *create_transport_mux_strategy_lock (void) = 0; + virtual ACE_Lock *create_transport_mux_strategy_lock () = 0; /// Return the size of the reply dispatcher table - virtual int reply_dispatcher_table_size (void) const = 0; + virtual int reply_dispatcher_table_size () const = 0; /// Create the correct client wait_for_reply strategy. virtual TAO_Wait_Strategy *create_wait_strategy (TAO_Transport *transport) = 0; @@ -83,20 +83,20 @@ public: }; /// Return the selected connection strategy option. - virtual Connect_Strategy connect_strategy (void) const = 0; + virtual Connect_Strategy connect_strategy () const = 0; /// Does the client allow any form of callback? - virtual int allow_callback (void) = 0; + virtual int allow_callback () = 0; /// Cleanup options for wait strategy. /** * Only applicable to RW wait strategy */ - virtual bool use_cleanup_options (void) const = 0; + virtual bool use_cleanup_options () const = 0; /// Return the parameters used to optionally retry invocation /// after an exception occurs. - virtual const TAO::Invocation_Retry_Params &invocation_retry_params (void) const = 0; + virtual const TAO::Invocation_Retry_Params &invocation_retry_params () const = 0; /// Return the value to be used as the default sync scope for the ORB virtual Messaging::SyncScope sync_scope () const = 0; diff --git a/TAO/tao/CodecFactory/CodecFactory.h b/TAO/tao/CodecFactory/CodecFactory.h index 80e79b20b7c..36729d3dcb3 100644 --- a/TAO/tao/CodecFactory/CodecFactory.h +++ b/TAO/tao/CodecFactory/CodecFactory.h @@ -38,7 +38,7 @@ public: ACE_TCHAR *argv []); /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/Condition.h b/TAO/tao/Condition.h index 0d7a1fd63c4..0b8c59e41b5 100644 --- a/TAO/tao/Condition.h +++ b/TAO/tao/Condition.h @@ -51,10 +51,10 @@ public: /// A default constructor. Since no lock is provided by the user, /// one will be created internally. - TAO_Condition (void); + TAO_Condition (); /// Implicitly destroy the condition variable. - ~TAO_Condition (void); + ~TAO_Condition (); // = Lock accessors. /** @@ -66,7 +66,7 @@ public: int wait (const ACE_Time_Value *abstime); /// Block on condition. - int wait (void); + int wait (); /** * Block on condition or until absolute time-of-day has passed. If @@ -79,17 +79,17 @@ public: int wait (MUTEX &mutex, const ACE_Time_Value *abstime = 0); /// Signal one waiting thread. - int signal (void); + int signal (); /// Signal *all* waiting threads. - int broadcast (void); + int broadcast (); // = Utility methods. /// Explicitly destroy the condition variable. - int remove (void); + int remove (); /// Returns a reference to the underlying mutex_; - MUTEX *mutex (void); + MUTEX *mutex (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Condition (const TAO_Condition<MUTEX> &)) diff --git a/TAO/tao/Connection_Purging_Strategy.h b/TAO/tao/Connection_Purging_Strategy.h index dc790a99e80..845b8222ffb 100644 --- a/TAO/tao/Connection_Purging_Strategy.h +++ b/TAO/tao/Connection_Purging_Strategy.h @@ -42,10 +42,10 @@ public: TAO_Connection_Purging_Strategy (int cache_maximum); /// The destructor - virtual ~TAO_Connection_Purging_Strategy (void); + virtual ~TAO_Connection_Purging_Strategy (); /// Return the maximum number of cache entries - virtual int cache_maximum (void) const; + virtual int cache_maximum () const; /// Sub-classes must implement these methods virtual void update_item (TAO_Transport& transport) = 0; diff --git a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h index 2ba8a45bf58..df83f5f3124 100644 --- a/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h +++ b/TAO/tao/Dynamic_TP/DTP_Thread_Pool.h @@ -241,7 +241,6 @@ public: // @} private: - /// @name Helpers // @{ @@ -253,7 +252,6 @@ private: // @} private: - TAO_ORB_Core &orb_core_; THREAD_POOLS thread_pools_; diff --git a/TAO/tao/Environment.h b/TAO/tao/Environment.h index 8b3e2269022..d381afd7329 100644 --- a/TAO/tao/Environment.h +++ b/TAO/tao/Environment.h @@ -74,7 +74,7 @@ namespace CORBA public: /// The default constructor. The environment will hold no /// exceptions. - Environment (void); + Environment (); /// Copy constructor. Environment (const Environment &ACE_TRY_ENV); @@ -83,11 +83,11 @@ namespace CORBA Environment &operator=(const Environment &ACE_TRY_ENV); /// Destructor, release the exception. - ~Environment (void); + ~Environment (); /// Some static methods that need to be defined in every pseudo object static Environment * _duplicate (Environment *); - static Environment * _nil (void); + static Environment * _nil (); /// Return the contained CORBA::Exception. /** @@ -98,7 +98,7 @@ namespace CORBA * "C++ Language Mapping" (formal/00-01-02). Section 1.27 * Environment (page 1-113) */ - CORBA::Exception* exception (void) const; + CORBA::Exception* exception () const; /// Set the contained CORBA::Exception to @a ex /** @@ -114,20 +114,20 @@ namespace CORBA /// Return if the exception is a user exception or a system /// exception. - int exception_type (void) const; + int exception_type () const; /// return the repository ID for the exception. - const char *exception_id (void) const; + const char *exception_id () const; /// Clear the exception. - void clear (void); + void clear (); /// Print the exception to output determined by f. This function /// is not CORBA compliant. void print_exception (const char *info, FILE *f=stdout) const; // = Obtain a default environment to use with TAO. - static CORBA::Environment &default_environment (void); + static CORBA::Environment &default_environment (); // Useful for template programming. typedef CORBA::Environment_ptr _ptr_type; diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 3e20fd0b4e5..cec1728c15d 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -110,25 +110,25 @@ namespace CORBA Exception (const Exception &src); /// Destructor. - virtual ~Exception (void); + virtual ~Exception (); // = To throw the exception (when using the standard mapping). - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; // = The static narrow operations. static Exception * _downcast (Exception * x); static Exception const * _downcast (Exception const * x); /// Return the repository ID of the Exception. - virtual const char * _rep_id (void) const; + virtual const char * _rep_id () const; /// Return the name of the Exception. - virtual const char * _name (void) const; + virtual const char * _name () const; // = These are TAO-specific extensions. /// Will be overridden in the concrete derived classes. - virtual CORBA::TypeCode_ptr _tao_type (void) const = 0; + virtual CORBA::TypeCode_ptr _tao_type () const = 0; /// Print the exception to output determined by @a f. /** @@ -146,7 +146,7 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const = 0; + virtual ACE_CString _info () const = 0; virtual void _tao_encode (TAO_OutputCDR &cdr) const = 0; @@ -177,11 +177,11 @@ namespace CORBA * }; * </PRE> */ - virtual CORBA::Exception *_tao_duplicate (void) const = 0; + virtual CORBA::Exception *_tao_duplicate () const = 0; protected: /// Default constructor. - Exception (void); + Exception (); /// Assignment operator. Exception & operator = (const Exception & src); diff --git a/TAO/tao/Exception_Data.h b/TAO/tao/Exception_Data.h index e10b104bf0c..071d6cfd8dc 100644 --- a/TAO/tao/Exception_Data.h +++ b/TAO/tao/Exception_Data.h @@ -35,7 +35,7 @@ namespace TAO // Function pointer returning a pointer to CORBA::Exception. This is used to // describe the allocator for user-defined exceptions that are used internally // by the interpreter. - typedef CORBA::Exception* (*TAO_Exception_Alloc) (void); + typedef CORBA::Exception* (*TAO_Exception_Alloc) (); /** * @struct Exception_Data diff --git a/TAO/tao/Fault_Tolerance_Service.h b/TAO/tao/Fault_Tolerance_Service.h index 5a6e4c7e7e4..e7bd1f7e1af 100644 --- a/TAO/tao/Fault_Tolerance_Service.h +++ b/TAO/tao/Fault_Tolerance_Service.h @@ -41,16 +41,16 @@ class TAO_Export TAO_Fault_Tolerance_Service public: /// Ctor - TAO_Fault_Tolerance_Service (void); + TAO_Fault_Tolerance_Service (); /// Dtor - ~TAO_Fault_Tolerance_Service (void); + ~TAO_Fault_Tolerance_Service (); /// Initialize the internal data structures void init (TAO_ORB_Core *orb_core); /// Return the underlying callback object - TAO_Service_Callbacks *service_callback (void); + TAO_Service_Callbacks *service_callback (); private: void operator= (const TAO_Fault_Tolerance_Service &); diff --git a/TAO/tao/Fixed_Size_Argument_T.h b/TAO/tao/Fixed_Size_Argument_T.h index 706229b5a46..6369762f23d 100644 --- a/TAO/tao/Fixed_Size_Argument_T.h +++ b/TAO/tao/Fixed_Size_Argument_T.h @@ -39,7 +39,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; protected: S const * x_; @@ -58,9 +58,9 @@ namespace TAO { public: In_Fixed_Size_Clonable_Argument_T (S const & x); - virtual ~In_Fixed_Size_Clonable_Argument_T (void); + virtual ~In_Fixed_Size_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -84,7 +84,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S * x_; @@ -107,7 +107,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -124,15 +124,15 @@ namespace TAO class Ret_Fixed_Size_Argument_T : public RetArgument { public: - Ret_Fixed_Size_Argument_T (void); + Ret_Fixed_Size_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); - S excp (void); - S retn (void); + S & arg (); + S excp (); + S retn (); protected: S x_; diff --git a/TAO/tao/GIOP_Fragmentation_Strategy.h b/TAO/tao/GIOP_Fragmentation_Strategy.h index 7bb4e8abba6..47ff70e4865 100644 --- a/TAO/tao/GIOP_Fragmentation_Strategy.h +++ b/TAO/tao/GIOP_Fragmentation_Strategy.h @@ -38,10 +38,10 @@ class TAO_Export TAO_GIOP_Fragmentation_Strategy { public: /// Constructor - TAO_GIOP_Fragmentation_Strategy (void) {} + TAO_GIOP_Fragmentation_Strategy () {} /// Destructor. - virtual ~TAO_GIOP_Fragmentation_Strategy (void); + virtual ~TAO_GIOP_Fragmentation_Strategy (); /// Fragment the (potentially partially) encoded GIOP message. /** diff --git a/TAO/tao/GIOP_Message_Base.h b/TAO/tao/GIOP_Message_Base.h index f726e620176..73faaaa4a49 100644 --- a/TAO/tao/GIOP_Message_Base.h +++ b/TAO/tao/GIOP_Message_Base.h @@ -54,7 +54,7 @@ public: size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE); /// Destructor - ~TAO_GIOP_Message_Base (void); + ~TAO_GIOP_Message_Base (); /// Initialize the underlying state object based on the @a major and /// @a minor revision numbers @@ -121,13 +121,13 @@ public: const CORBA::Exception &x); /// Header length - size_t header_length (void) const; + size_t header_length () const; /// The header length of a fragment size_t fragment_header_length ( const TAO_GIOP_Message_Version& giop_version) const; - TAO_OutputCDR &out_stream (void); + TAO_OutputCDR &out_stream (); /// Consolidate fragmented message with associated fragments, being /// stored within this class. If reliable transport is used (like @@ -149,7 +149,7 @@ public: int discard_fragmented_message (const TAO_Queued_Data *cancel_request); /// Outgoing GIOP message fragmentation strategy. - TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (void); + TAO_GIOP_Fragmentation_Strategy * fragmentation_strategy (); /// Is the messaging object ready for processing BiDirectional /// request/response? diff --git a/TAO/tao/GIOP_Message_Generator_Parser.h b/TAO/tao/GIOP_Message_Generator_Parser.h index 78a429daa0a..7a901a16a41 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser.h +++ b/TAO/tao/GIOP_Message_Generator_Parser.h @@ -46,7 +46,7 @@ class TAO_ServerRequest; class TAO_GIOP_Message_Generator_Parser { public: - virtual ~TAO_GIOP_Message_Generator_Parser (void); + virtual ~TAO_GIOP_Message_Generator_Parser (); /// Write the request header in to @a msg virtual bool write_request_header ( @@ -93,15 +93,15 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const = 0; - virtual CORBA::Octet minor_version (void) const = 0; + virtual CORBA::Octet major_version () const = 0; + virtual CORBA::Octet minor_version () const = 0; /// Is the messaging object ready for processing BiDirectional /// request/response? - virtual bool is_ready_for_bidirectional (void) const; + virtual bool is_ready_for_bidirectional () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const = 0; + virtual size_t fragment_header_length () const = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_10.h b/TAO/tao/GIOP_Message_Generator_Parser_10.h index 936913a0b27..b4c277bb3d2 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_10.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_10.h @@ -75,11 +75,11 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const; - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet major_version () const; + virtual CORBA::Octet minor_version () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const; + virtual size_t fragment_header_length () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_11.h b/TAO/tao/GIOP_Message_Generator_Parser_11.h index 23f5c33822c..b63749b7a5d 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_11.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_11.h @@ -34,7 +34,7 @@ class TAO_GIOP_Message_Generator_Parser_11 { public: /// Our minor version - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet minor_version () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.h b/TAO/tao/GIOP_Message_Generator_Parser_12.h index b188879bdfb..8bfb114ce92 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.h +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.h @@ -77,15 +77,15 @@ public: TAO_Pluggable_Reply_Params ¶ms); /// Our versions - virtual CORBA::Octet major_version (void) const; - virtual CORBA::Octet minor_version (void) const; + virtual CORBA::Octet major_version () const; + virtual CORBA::Octet minor_version () const; /// Is the messaging object ready for processing BiDirectional /// request/response? - virtual bool is_ready_for_bidirectional (void) const; + virtual bool is_ready_for_bidirectional () const; /// The header length of a fragment - virtual size_t fragment_header_length (void) const; + virtual size_t fragment_header_length () const; private: /// Marshall the TargetSpecification diff --git a/TAO/tao/GIOP_Message_State.h b/TAO/tao/GIOP_Message_State.h index 8245ff6842b..0619ff42814 100644 --- a/TAO/tao/GIOP_Message_State.h +++ b/TAO/tao/GIOP_Message_State.h @@ -39,7 +39,7 @@ class TAO_Export TAO_GIOP_Message_State { public: /// Constructor - TAO_GIOP_Message_State (void); + TAO_GIOP_Message_State (); /// Parse the message header. /// @@ -50,27 +50,27 @@ public: int parse_message_header (ACE_Message_Block &incoming); /// Return the message size - CORBA::ULong message_size (void) const; + CORBA::ULong message_size () const; /// Return the message size - CORBA::ULong payload_size (void) const; + CORBA::ULong payload_size () const; /// Return the byte order information - CORBA::Octet byte_order (void) const; + CORBA::Octet byte_order () const; /// Return the message type - GIOP::MsgType message_type (void) const; + GIOP::MsgType message_type () const; /// Return the more fragments - CORBA::Boolean more_fragments (void) const; + CORBA::Boolean more_fragments () const; void more_fragments (CORBA::Boolean fragment); /// Get the GIOP version - TAO_GIOP_Message_Version const &giop_version (void) const; + TAO_GIOP_Message_Version const &giop_version () const; /// Return the compressed information - CORBA::Boolean compressed (void) const; + CORBA::Boolean compressed () const; private: /// Parse the message header. diff --git a/TAO/tao/GIOP_Message_Version.h b/TAO/tao/GIOP_Message_Version.h index 517c40658fa..4605ad57ff4 100644 --- a/TAO/tao/GIOP_Message_Version.h +++ b/TAO/tao/GIOP_Message_Version.h @@ -41,13 +41,13 @@ public: CORBA::Octet major; /// Get major version number - CORBA::Octet major_version (void) const; + CORBA::Octet major_version () const; /// Minor version number CORBA::Octet minor; /// Get minor version number - CORBA::Octet minor_version (void) const; + CORBA::Octet minor_version () const; /// Copy constructor TAO_GIOP_Message_Version (const TAO_GIOP_Message_Version &src); diff --git a/TAO/tao/Generic_Sequence_T.h b/TAO/tao/Generic_Sequence_T.h index 33e507af217..07a46d0d6f4 100644 --- a/TAO/tao/Generic_Sequence_T.h +++ b/TAO/tao/Generic_Sequence_T.h @@ -78,7 +78,7 @@ public: typedef range_checking<value_type,true> range; /// Default constructor. - generic_sequence(void) + generic_sequence() : maximum_(allocation_traits::default_maximum()) , length_(0) , buffer_(allocation_traits::default_buffer_allocation()) diff --git a/TAO/tao/IORInterceptor_Adapter.h b/TAO/tao/IORInterceptor_Adapter.h index f15092f2e8a..f85484f38a0 100644 --- a/TAO/tao/IORInterceptor_Adapter.h +++ b/TAO/tao/IORInterceptor_Adapter.h @@ -59,7 +59,7 @@ class TAO_Root_POA; class TAO_Export TAO_IORInterceptor_Adapter { public: - virtual ~TAO_IORInterceptor_Adapter (void); + virtual ~TAO_IORInterceptor_Adapter (); virtual void add_interceptor ( PortableInterceptor::IORInterceptor_ptr interceptor) = 0; @@ -68,7 +68,7 @@ public: PortableInterceptor::IORInterceptor_ptr interceptor, const CORBA::PolicyList& policies) = 0; - virtual void destroy_interceptors (void) = 0; + virtual void destroy_interceptors () = 0; /// Call the IORInterceptor::establish_components() method on all /// registered IORInterceptors. diff --git a/TAO/tao/Incoming_Message_Queue.h b/TAO/tao/Incoming_Message_Queue.h index 2ad553aad59..fd128efea0c 100644 --- a/TAO/tao/Incoming_Message_Queue.h +++ b/TAO/tao/Incoming_Message_Queue.h @@ -55,15 +55,15 @@ public: TAO_Incoming_Message_Queue (TAO_ORB_Core *orb_core); /// Destructor. - ~TAO_Incoming_Message_Queue (void); + ~TAO_Incoming_Message_Queue (); /// Adding and deleting a node from the queue. - TAO_Queued_Data *dequeue_head (void); - TAO_Queued_Data *dequeue_tail (void); + TAO_Queued_Data *dequeue_head (); + TAO_Queued_Data *dequeue_tail (); int enqueue_tail (TAO_Queued_Data *nd); /// Return the length of the queue.. - CORBA::ULong queue_length (void) const; + CORBA::ULong queue_length () const; private: diff --git a/TAO/tao/Intrusive_Ref_Count_Base_T.h b/TAO/tao/Intrusive_Ref_Count_Base_T.h index c4c6f181b75..26092e3a8e0 100644 --- a/TAO/tao/Intrusive_Ref_Count_Base_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Base_T.h @@ -43,13 +43,13 @@ template <class ACE_LOCK> class TAO_Intrusive_Ref_Count_Base { public: - virtual ~TAO_Intrusive_Ref_Count_Base (void); + virtual ~TAO_Intrusive_Ref_Count_Base (); - void _add_ref (void); - void _remove_ref (void); + void _add_ref (); + void _remove_ref (); protected: - TAO_Intrusive_Ref_Count_Base (void); + TAO_Intrusive_Ref_Count_Base (); private: #if defined (ACE_HAS_CPP11) diff --git a/TAO/tao/Intrusive_Ref_Count_Handle_T.h b/TAO/tao/Intrusive_Ref_Count_Handle_T.h index 1974d07e2bf..2b293e14b47 100644 --- a/TAO/tao/Intrusive_Ref_Count_Handle_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Handle_T.h @@ -65,7 +65,7 @@ class TAO_Intrusive_Ref_Count_Handle public: /// Default Constructor - enters the "nil" state. - TAO_Intrusive_Ref_Count_Handle (void); + TAO_Intrusive_Ref_Count_Handle (); /// Ctor - By default, takes ownership of passed-in "copy" of reference /// to T. But the second argument (bool) can be changed from @@ -83,7 +83,7 @@ public: TAO_Intrusive_Ref_Count_Handle (const TAO_Intrusive_Ref_Count_Handle& b); /// Destructor - ~TAO_Intrusive_Ref_Count_Handle (void); + ~TAO_Intrusive_Ref_Count_Handle (); /// Assignment Operator with T* argument. /// Takes ownership of passed-in "copy" of reference to T. @@ -99,21 +99,21 @@ public: /// Returns true if underlying pointer is NULL (0). /// Returns false otherwise. - bool is_nil (void) const; + bool is_nil () const; /// Used to pass the underlying pointer as an "IN" argument to a method. - T* in (void) const; + T* in () const; /// Used to pass the underlying pointer as an "IN/OUT" argument to a method. - T*& inout (void); + T*& inout (); /// Used to pass the underlying pointer as an "OUT" argument to a method. - T*& out (void); + T*& out (); /// Used to take-away the underlying pointer from this smart pointer object. /// Caller becomes responsibe for the returned "copy" to the reference. /// Always leaves the smart pointer in the "nil" state upon return. - T* _retn (void); + T* _retn (); /// Equality operator allows the refcounted object to be used generically /// as a contained object @@ -124,14 +124,14 @@ private: /// Claim a "copy" of the reference-counted object by adding /// one to its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. - void claim (void); + void claim (); /// Drop our "copy" of the reference-counted object by removing /// one from its reference counter. Do nothing if this smart pointer /// object is currently in the "nil" state. /// Note that this method will always leave this smart pointer /// in the "nil" state upon its return. - void drop (void); + void drop (); /// The underlying pointer to the (intrusively) reference-counted object. /// Set to 0 when this smart pointer is in the "nil" state. Otherwise, diff --git a/TAO/tao/Intrusive_Ref_Count_Object_T.h b/TAO/tao/Intrusive_Ref_Count_Object_T.h index c3429bb15e9..1d97550e93e 100644 --- a/TAO/tao/Intrusive_Ref_Count_Object_T.h +++ b/TAO/tao/Intrusive_Ref_Count_Object_T.h @@ -38,13 +38,13 @@ class TAO_Intrusive_Ref_Count_Object : public TAO_Intrusive_Ref_Count_Base <ACE_ public: /// take ownership of obj. TAO_Intrusive_Ref_Count_Object (OBJ* obj); - virtual ~TAO_Intrusive_Ref_Count_Object (void); + virtual ~TAO_Intrusive_Ref_Count_Object (); OBJ* get () const; private: // Prevent default constructor used. - TAO_Intrusive_Ref_Count_Object (void); + TAO_Intrusive_Ref_Count_Object (); // Prevent copying/assignment. TAO_Intrusive_Ref_Count_Object (const TAO_Intrusive_Ref_Count_Object&); diff --git a/TAO/tao/Invocation_Adapter.h b/TAO/tao/Invocation_Adapter.h index 68e9bc4d40b..9f2304da7f4 100644 --- a/TAO/tao/Invocation_Adapter.h +++ b/TAO/tao/Invocation_Adapter.h @@ -111,7 +111,7 @@ namespace TAO TAO::Invocation_Mode mode = TAO_SYNCHRONOUS_INVOCATION, bool has_in_args = true); - virtual ~Invocation_Adapter (void); + virtual ~Invocation_Adapter (); /// Invoke the target, and used by the generated code. /** @@ -231,7 +231,7 @@ namespace TAO bool get_timeout (TAO_Stub *stub, ACE_Time_Value &val); /// Helper method that extracts TAO_Stub from the target object. - TAO_Stub *get_stub (void) const; + TAO_Stub *get_stub () const; /// Helper method that takes care of setting the profiles within /// the stub object if the target gets forwarded @@ -245,7 +245,7 @@ namespace TAO private: /// Don't allow default initializations - Invocation_Adapter (void); + Invocation_Adapter (); // Prevent copying Invocation_Adapter (Invocation_Adapter const &); diff --git a/TAO/tao/Invocation_Base.h b/TAO/tao/Invocation_Base.h index 91e2c97e768..c44772a678d 100644 --- a/TAO/tao/Invocation_Base.h +++ b/TAO/tao/Invocation_Base.h @@ -57,11 +57,11 @@ namespace TAO class TAO_Export Invocation_Base { public: - virtual ~Invocation_Base (void); + virtual ~Invocation_Base (); /// Accessor and mutator methods //@{ - TAO_Stub *stub (void) const; + TAO_Stub *stub () const; /// Accessor and mutator methods for forwarded object /// locations. @@ -69,7 +69,7 @@ namespace TAO * These access methods have to be public so that the * PortableInterceptor can use them */ - CORBA::Object_ptr forwarded_reference (void); + CORBA::Object_ptr forwarded_reference (); void forwarded_reference (CORBA::Object_ptr o); /// Accessors for the service context list. @@ -78,33 +78,33 @@ namespace TAO * elsewhere. Providing this accessor helps the PI to access this * list in both remote and collocated mode. */ - TAO_Service_Context &request_service_context (void); - TAO_Service_Context &reply_service_context (void); + TAO_Service_Context &request_service_context (); + TAO_Service_Context &reply_service_context (); /// Return the forwarded object location by loosing ownership. - CORBA::Object_ptr steal_forwarded_reference (void); + CORBA::Object_ptr steal_forwarded_reference (); /// Return the effective target of the invocation. /** * Please see the PortableInterceptor specification in the CORBA * spec to understand what effective target means. */ - CORBA::Object_ptr effective_target (void) const; + CORBA::Object_ptr effective_target () const; /// Return the target object - CORBA::Object_ptr target (void) const; + CORBA::Object_ptr target () const; /// Does this invocation return a response? - CORBA::Boolean response_expected (void) const; + CORBA::Boolean response_expected () const; /// Accessor of reply_status of the invocation. - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; /// Mutator of reply_status of the invocation. void reply_status (GIOP::ReplyStatusType s); /// The operaton details of the invocation - TAO_Operation_Details &operation_details (void); + TAO_Operation_Details &operation_details (); //@} protected: @@ -174,19 +174,19 @@ namespace TAO * code must be able to modify this value and use that value * at a later time without being forced to use TSS. */ - size_t &stack_size (void); + size_t &stack_size (); - CORBA::Exception *caught_exception (void); + CORBA::Exception *caught_exception (); /// Change the exception status. void exception (CORBA::Exception *exception); /// Invocation status. - TAO::Invocation_Status invoke_status (void) const; + TAO::Invocation_Status invoke_status () const; /// Mutator to set the invocation status. void invoke_status (Invocation_Status s); - PortableInterceptor::ReplyStatus pi_reply_status (void) const; + PortableInterceptor::ReplyStatus pi_reply_status () const; /// Accessor used to determine if the current invocation is part /// of a remote request, and if not, it will be considered to be @@ -196,22 +196,22 @@ namespace TAO protected: /// Helper method to invoke send_request interception call to all /// the registered interceptors. - Invocation_Status send_request_interception (void); + Invocation_Status send_request_interception (); /// Helper method to invoke receive_reply interception call to all /// the registered interceptors. - Invocation_Status receive_reply_interception (void); + Invocation_Status receive_reply_interception (); /// Helper method to invoke receive_other interception call to all /// the registered interceptors. - Invocation_Status receive_other_interception (void); + Invocation_Status receive_other_interception (); /// Helper methods to handle interception calls when exceptions /// are thrown by the PortableInterceptor. PortableInterceptor::ReplyStatus handle_any_exception (CORBA::Exception * e); - PortableInterceptor::ReplyStatus handle_all_exception (void); + PortableInterceptor::ReplyStatus handle_all_exception (); protected: /// The client requestor adapter diff --git a/TAO/tao/LocalObject.h b/TAO/tao/LocalObject.h index 0e11bcd646d..bd6732bd654 100644 --- a/TAO/tao/LocalObject.h +++ b/TAO/tao/LocalObject.h @@ -46,13 +46,13 @@ namespace CORBA public: /// Destructor - virtual ~LocalObject (void); + virtual ~LocalObject (); /// Increment the ref count static LocalObject_ptr _duplicate (LocalObject_ptr obj); /// Return a NIL object - static LocalObject_ptr _nil (void); + static LocalObject_ptr _nil (); /** * @todo Narrowing a LocalObject to a CORBA::Object is broken @@ -66,17 +66,17 @@ namespace CORBA #if (TAO_HAS_MINIMUM_CORBA == 0) /// Always returns false. - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) /// Gets info about object from the Interface Repository. - virtual CORBA::InterfaceDef_ptr _get_interface (void); + virtual CORBA::InterfaceDef_ptr _get_interface (); /// Throws NO_IMPLEMENT. - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); virtual void _create_request (CORBA::Context_ptr ctx, const char * operation, @@ -139,12 +139,12 @@ namespace CORBA */ virtual CORBA::Boolean _is_equivalent (CORBA::Object_ptr other_obj); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); // = TAO extensions /// Throws CORBA::NO_IMPLEMENT. - virtual TAO::ObjectKey * _key (void); + virtual TAO::ObjectKey * _key (); /// Useful for template programming. typedef LocalObject_ptr _ptr_type; @@ -156,7 +156,7 @@ namespace CORBA /** * Make it protected to prevent instantiation of this class. */ - LocalObject (void); + LocalObject (); private: /** diff --git a/TAO/tao/MProfile.h b/TAO/tao/MProfile.h index 7d3aa640e01..d00ce8384b7 100644 --- a/TAO/tao/MProfile.h +++ b/TAO/tao/MProfile.h @@ -69,7 +69,7 @@ public: /// Destructor: decrements reference count on all references /// profiles! - ~TAO_MProfile (void); + ~TAO_MProfile (); /// Inits MProfile to hold sz TAO_Profiles. /// NOT THREAD SAFE @@ -88,20 +88,20 @@ public: int grow (CORBA::ULong sz); /// Treat as a circular list. - TAO_Profile *get_cnext (void); + TAO_Profile *get_cnext (); /// Get next profile in list, return 0 at end of list. - TAO_Profile *get_next (void); + TAO_Profile *get_next (); /// Assume a circular list of profiles. - TAO_Profile *get_cprev (void); + TAO_Profile *get_cprev (); /// Get previous profile, stop at beginning of list and return 0. - TAO_Profile *get_prev (void); + TAO_Profile *get_prev (); /// Return a pointer to the current profile, will not increment /// reference pointer. - TAO_Profile *get_current_profile (void); + TAO_Profile *get_current_profile (); /// Return a pointer to the profile referenced by handle void. TAO_Profile *get_profile (TAO_PHandle handle); @@ -109,24 +109,24 @@ public: // rem_profile (TAO_PHandle handle); let's wait. /// Returns the index for the current profile. - TAO_PHandle get_current_handle (void); + TAO_PHandle get_current_handle (); /// Returns the index for the current profile. - TAO_PHandle get_current_handle (void) const; + TAO_PHandle get_current_handle () const; /// Returns the number of profiles stored in the list (last_+1). - CORBA::ULong profile_count (void) const; + CORBA::ULong profile_count () const; /// return the maximum number of profiles that can be stored in this /// container, (size_+1) - CORBA::ULong size (void) const; + CORBA::ULong size () const; /// Return the profile at position <slot>. If <slot> is out of range /// it returns 0. const TAO_Profile* get_profile (CORBA::ULong slot) const; /// Sets the current slot back to 0. - void rewind (void); + void rewind (); /// Return the index of this entry or -1 if it can not be added. /// reference count on profile in incremented! @@ -151,7 +151,7 @@ public: void forward_from (TAO_MProfile *mprofiles); /// Returns a pointer to the profile which was forwarded. - TAO_MProfile *forward_from (void); + TAO_MProfile *forward_from (); /** * Returns true of there is at least one profile in first which @@ -171,7 +171,7 @@ public: protected: /// This method handle the dynamic allocation of the data member /// <policy_list_>. - void create_policy_list (void); + void create_policy_list (); public: /// Sets the policies list associated with the profiles @@ -180,11 +180,11 @@ public: /// Gets the policies list associated with the profiles /// owned by the TAO_MProfile. - CORBA::PolicyList *policy_list (void); + CORBA::PolicyList *policy_list (); protected: /// Initialize the policy list, demarsharling the policy. - void init_policy_list (void); + void init_policy_list (); protected: /// Stores the policy list for the profile of this MProfile. @@ -200,12 +200,12 @@ protected: protected: /// Return the complete list of profiles, this object retains /// ownership! - TAO_Profile **pfiles (void) const; + TAO_Profile **pfiles () const; private: /// Helper method to implement the destructor - void cleanup (void); + void cleanup (); /// A helper to give_profile to be used when share is true. This /// method is used primarily to help the corbaloc parser create a diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index ed3b08b2b17..f1ab26afb16 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -29,7 +29,7 @@ TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () { } -TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler (void) +TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler () { this->transport_->remove_reference (); @@ -86,7 +86,7 @@ TAO_AMH_Response_Handler::init(TAO_ServerRequest &server_request, } void -TAO_AMH_Response_Handler::_tao_rh_init_reply (void) +TAO_AMH_Response_Handler::_tao_rh_init_reply () { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -126,7 +126,7 @@ TAO_AMH_Response_Handler::_tao_rh_init_reply (void) } void -TAO_AMH_Response_Handler::_tao_rh_send_reply (void) +TAO_AMH_Response_Handler::_tao_rh_send_reply () { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -311,7 +311,7 @@ TAO_AMH_Response_Handler::_tao_rh_send_location_forward (CORBA::Object_ptr fwd, } void -TAO_AMH_Response_Handler::_remove_ref (void) +TAO_AMH_Response_Handler::_remove_ref () { if (--this->refcount_ == 0) { diff --git a/TAO/tao/Messaging/AMH_Response_Handler.h b/TAO/tao/Messaging/AMH_Response_Handler.h index 703728eba77..a7fbfbcbe69 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.h +++ b/TAO/tao/Messaging/AMH_Response_Handler.h @@ -74,7 +74,7 @@ public: * Releases the transport and in case of an error, sends the appropriate * exception back to the client */ - virtual ~TAO_AMH_Response_Handler (void); + virtual ~TAO_AMH_Response_Handler (); /** * Stores necessary information from a TAO_Server_Request onto the heap @@ -84,17 +84,17 @@ public: /// @name Mutators for refcount //@{ - virtual void _remove_ref (void); + virtual void _remove_ref (); //@} protected: /// Sets up the various parameters in anticipation of returning a reply /// to the client. return/OUT/INOUT arguments are marshalled into the /// Output stream after this method has been called. - void _tao_rh_init_reply (void); + void _tao_rh_init_reply (); /// Sends the marshalled reply back to the client. - void _tao_rh_send_reply (void); + void _tao_rh_send_reply (); /// Send back an exception to the client. void _tao_rh_send_exception (const CORBA::Exception &ex); diff --git a/TAO/tao/Messaging/AMH_Skeletons.cpp b/TAO/tao/Messaging/AMH_Skeletons.cpp index f2781a1b81e..284ad831305 100644 --- a/TAO/tao/Messaging/AMH_Skeletons.cpp +++ b/TAO/tao/Messaging/AMH_Skeletons.cpp @@ -22,7 +22,7 @@ #include "tao/TAO_Server_Request.h" void -_is_a_amh_Upcall_Command::execute (void) +_is_a_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -83,7 +83,7 @@ TAO_AMH_Skeletons::_is_a_amh_skel (TAO_ServerRequest & server_request, #if (TAO_HAS_MINIMUM_CORBA == 0) void -_non_existent_amh_Upcall_Command::execute (void) +_non_existent_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -163,7 +163,7 @@ TAO_AMH_Skeletons::_interface_amh_skel (TAO_ServerRequest & server_request, } void -_get_component_amh_Upcall_Command::execute (void) +_get_component_amh_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -214,7 +214,7 @@ TAO_AMH_Skeletons::_component_amh_skel (TAO_ServerRequest & server_request, void -_repository_id_amh_Upcall_Command::execute (void) +_repository_id_amh_Upcall_Command::execute () { TAO::SArg_Traits< char *>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< char *> ( diff --git a/TAO/tao/Messaging/AMH_Skeletons.h b/TAO/tao/Messaging/AMH_Skeletons.h index 3157a9c6793..fa6aa742f03 100644 --- a/TAO/tao/Messaging/AMH_Skeletons.h +++ b/TAO/tao/Messaging/AMH_Skeletons.h @@ -61,7 +61,7 @@ public: , args_ (args) {} - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -89,7 +89,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; TAO_Operation_Details const * const operation_details_; @@ -116,7 +116,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -144,7 +144,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp index d47234ebb0d..ff0302be5d1 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.cpp @@ -120,7 +120,7 @@ TAO_AMI_Arguments_Converter_Impl::handle_corba_exception ( // Initialization and registration of dynamic service object. int -TAO_AMI_Arguments_Converter_Impl::Initializer (void) +TAO_AMI_Arguments_Converter_Impl::Initializer () { return ACE_Service_Config::process_directive ( ace_svc_desc_TAO_AMI_Arguments_Converter_Impl); diff --git a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h index 6f0ebd8cb1f..59a5ead3ebc 100644 --- a/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h +++ b/TAO/tao/Messaging/AMI_Arguments_Converter_Impl.h @@ -58,7 +58,7 @@ public: CORBA::Exception *exception); // Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h index c6af67798b7..7175889b3a4 100644 --- a/TAO/tao/Messaging/Asynch_Invocation_Adapter.h +++ b/TAO/tao/Messaging/Asynch_Invocation_Adapter.h @@ -94,7 +94,7 @@ namespace TAO private: /// Don't allow default initializations - Asynch_Invocation_Adapter (void); + Asynch_Invocation_Adapter (); Asynch_Invocation_Adapter (const Asynch_Invocation_Adapter &); Asynch_Invocation_Adapter & operator= (const Asynch_Invocation_Adapter &); diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp index 31e20589456..a85a96033e8 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.cpp @@ -23,7 +23,7 @@ TAO_Asynch_Reply_Dispatcher::TAO_Asynch_Reply_Dispatcher ( } // Destructor. -TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher (void) +TAO_Asynch_Reply_Dispatcher::~TAO_Asynch_Reply_Dispatcher () { } @@ -147,7 +147,7 @@ TAO_Asynch_Reply_Dispatcher::dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) } void -TAO_Asynch_Reply_Dispatcher::connection_closed (void) +TAO_Asynch_Reply_Dispatcher::connection_closed () { try { @@ -196,7 +196,7 @@ TAO_Asynch_Reply_Dispatcher::connection_closed (void) // AMI Timeout Handling Begin void -TAO_Asynch_Reply_Dispatcher::reply_timed_out (void) +TAO_Asynch_Reply_Dispatcher::reply_timed_out () { try { diff --git a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h index 392487aa8a4..9ecb3b3abb5 100644 --- a/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h +++ b/TAO/tao/Messaging/Asynch_Reply_Dispatcher.h @@ -42,17 +42,17 @@ public: ACE_Allocator *allocator); /// Destructor. - virtual ~TAO_Asynch_Reply_Dispatcher (void); + virtual ~TAO_Asynch_Reply_Dispatcher (); /// @name The Reply Dispatcher methods //@{ virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms); - virtual void connection_closed (void); + virtual void connection_closed (); //@} /// Inform that the reply timed out - virtual void reply_timed_out (void); + virtual void reply_timed_out (); /// Install the timeout handler long schedule_timer (CORBA::ULong request_id, diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp index f6f4993050e..ed468eb16fa 100644 --- a/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp +++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.cpp @@ -31,7 +31,7 @@ TAO_Buffering_Constraint_Policy::TAO_Buffering_Constraint_Policy (const TAO_Buff } CORBA::PolicyType -TAO_Buffering_Constraint_Policy::policy_type (void) +TAO_Buffering_Constraint_Policy::policy_type () { return TAO::BUFFERING_CONSTRAINT_POLICY_TYPE; } @@ -53,7 +53,7 @@ TAO_Buffering_Constraint_Policy::create (const CORBA::Any& val) TAO_Buffering_Constraint_Policy * -TAO_Buffering_Constraint_Policy::clone (void) const +TAO_Buffering_Constraint_Policy::clone () const { TAO_Buffering_Constraint_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -63,13 +63,13 @@ TAO_Buffering_Constraint_Policy::clone (void) const } TAO::BufferingConstraint -TAO_Buffering_Constraint_Policy::buffering_constraint (void) +TAO_Buffering_Constraint_Policy::buffering_constraint () { return this->buffering_constraint_; } CORBA::Policy_ptr -TAO_Buffering_Constraint_Policy::copy (void) +TAO_Buffering_Constraint_Policy::copy () { TAO_Buffering_Constraint_Policy* servant = 0; ACE_NEW_THROW_EX (servant, @@ -80,12 +80,12 @@ TAO_Buffering_Constraint_Policy::copy (void) } void -TAO_Buffering_Constraint_Policy::destroy (void) +TAO_Buffering_Constraint_Policy::destroy () { } TAO_Cached_Policy_Type -TAO_Buffering_Constraint_Policy::_tao_cached_type (void) const +TAO_Buffering_Constraint_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_BUFFERING_CONSTRAINT; } diff --git a/TAO/tao/Messaging/Buffering_Constraint_Policy.h b/TAO/tao/Messaging/Buffering_Constraint_Policy.h index 63e207ab560..f65dc35667f 100644 --- a/TAO/tao/Messaging/Buffering_Constraint_Policy.h +++ b/TAO/tao/Messaging/Buffering_Constraint_Policy.h @@ -54,22 +54,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of @c this. - virtual TAO_Buffering_Constraint_Policy *clone (void) const; + virtual TAO_Buffering_Constraint_Policy *clone () const; // = The TAO::Buffering_Constraint_Policy methods - virtual TAO::BufferingConstraint buffering_constraint (void); + virtual TAO::BufferingConstraint buffering_constraint (); void get_buffering_constraint (TAO::BufferingConstraint &) const; - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index ee9cbf65964..d8ebe3a5c3d 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -32,13 +32,13 @@ TAO_ConnectionTimeoutPolicy::TAO_ConnectionTimeoutPolicy ( } TimeBase::TimeT -TAO_ConnectionTimeoutPolicy::relative_expiry (void) +TAO_ConnectionTimeoutPolicy::relative_expiry () { return this->relative_expiry_; } CORBA::PolicyType -TAO_ConnectionTimeoutPolicy::policy_type (void) +TAO_ConnectionTimeoutPolicy::policy_type () { return TAO::CONNECTION_TIMEOUT_POLICY_TYPE; } @@ -119,7 +119,7 @@ TAO_ConnectionTimeoutPolicy::create (const CORBA::Any& val) } TAO_ConnectionTimeoutPolicy * -TAO_ConnectionTimeoutPolicy::clone (void) const +TAO_ConnectionTimeoutPolicy::clone () const { TAO_ConnectionTimeoutPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -129,7 +129,7 @@ TAO_ConnectionTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_ConnectionTimeoutPolicy::copy (void) +TAO_ConnectionTimeoutPolicy::copy () { // Future policy implementors: notice how the following code is // exception safe! @@ -143,12 +143,12 @@ TAO_ConnectionTimeoutPolicy::copy (void) } void -TAO_ConnectionTimeoutPolicy::destroy (void) +TAO_ConnectionTimeoutPolicy::destroy () { } TAO_Cached_Policy_Type -TAO_ConnectionTimeoutPolicy::_tao_cached_type (void) const +TAO_ConnectionTimeoutPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_CONNECTION_TIMEOUT; } diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 839d5024450..02a182a3a54 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -64,22 +64,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of <this>. - virtual TAO_ConnectionTimeoutPolicy *clone (void) const; + virtual TAO_ConnectionTimeoutPolicy *clone () const; // = The TAO::ConnectionTinoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void); + virtual TimeBase::TimeT relative_expiry (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Messaging/ExceptionHolder_i.cpp b/TAO/tao/Messaging/ExceptionHolder_i.cpp index d96e916f00c..12378b020b4 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.cpp +++ b/TAO/tao/Messaging/ExceptionHolder_i.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - ExceptionHolder::ExceptionHolder (void) : + ExceptionHolder::ExceptionHolder () : data_ (0), count_ (0), char_translator_ (0), @@ -47,7 +47,7 @@ namespace TAO this->count_ = exceptions_count; } - void ExceptionHolder::raise_exception (void) + void ExceptionHolder::raise_exception () { TAO_InputCDR _tao_in ((const char*) this->marshaled_exception ().get_buffer (), this->marshaled_exception ().length (), @@ -138,7 +138,7 @@ namespace TAO } CORBA::ValueBase* - ExceptionHolder::_copy_value (void) + ExceptionHolder::_copy_value () { TAO::ExceptionHolder* ret_val = 0; ACE_NEW_THROW_EX (ret_val, @@ -156,7 +156,7 @@ namespace TAO } CORBA::ValueBase * - ExceptionHolderFactory::create_for_unmarshal (void) + ExceptionHolderFactory::create_for_unmarshal () { TAO::ExceptionHolder* ret_val = 0; ACE_NEW_THROW_EX (ret_val, diff --git a/TAO/tao/Messaging/ExceptionHolder_i.h b/TAO/tao/Messaging/ExceptionHolder_i.h index f60bc86a0b0..0a1bda88ebb 100644 --- a/TAO/tao/Messaging/ExceptionHolder_i.h +++ b/TAO/tao/Messaging/ExceptionHolder_i.h @@ -45,7 +45,7 @@ namespace TAO public virtual ::CORBA::DefaultValueRefCountBase { public: - ExceptionHolder (void); + ExceptionHolder (); ExceptionHolder ( ::CORBA::Boolean is_system_exception, @@ -59,16 +59,16 @@ namespace TAO void set_exception_data (::TAO::Exception_Data* data, ::CORBA::ULong exceptions_count); - virtual void raise_exception (void); + virtual void raise_exception (); virtual void raise_exception_with_list ( const ::Dynamic::ExceptionList & exc_list); - virtual CORBA::ValueBase* _copy_value (void); + virtual CORBA::ValueBase* _copy_value (); protected: - virtual ~ExceptionHolder (void); + virtual ~ExceptionHolder (); private: TAO::Exception_Data* data_; @@ -88,7 +88,7 @@ namespace TAO public virtual CORBA::ValueFactoryBase { public: - virtual CORBA::ValueBase * create_for_unmarshal (void); + virtual CORBA::ValueBase * create_for_unmarshal (); }; } diff --git a/TAO/tao/Messaging/Messaging.cpp b/TAO/tao/Messaging/Messaging.cpp index afc92538ba0..afa6ebef8a8 100644 --- a/TAO/tao/Messaging/Messaging.cpp +++ b/TAO/tao/Messaging/Messaging.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_Messaging_Initializer::init (void) +TAO_Messaging_Initializer::init () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Messaging_Loader); } diff --git a/TAO/tao/Messaging/Messaging.h b/TAO/tao/Messaging/Messaging.h index d9520e92332..7a3aa49b9a0 100644 --- a/TAO/tao/Messaging/Messaging.h +++ b/TAO/tao/Messaging/Messaging.h @@ -33,7 +33,7 @@ class TAO_Messaging_Export TAO_Messaging_Initializer { public: /// Used to force the initialisation of the ORB code. - static int init (void); + static int init (); }; static const int TAO_Requires_Messaging_Initializer = TAO_Messaging_Initializer::init (); diff --git a/TAO/tao/Messaging/Messaging_Loader.cpp b/TAO/tao/Messaging/Messaging_Loader.cpp index bd25ad2d9e2..4b17c72cfa3 100644 --- a/TAO/tao/Messaging/Messaging_Loader.cpp +++ b/TAO/tao/Messaging/Messaging_Loader.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Messaging_Loader::TAO_Messaging_Loader (void) +TAO_Messaging_Loader::TAO_Messaging_Loader () : initialized_ (false) { } -TAO_Messaging_Loader::~TAO_Messaging_Loader (void) +TAO_Messaging_Loader::~TAO_Messaging_Loader () { } diff --git a/TAO/tao/Messaging/Messaging_Loader.h b/TAO/tao/Messaging/Messaging_Loader.h index aa9b3247527..8229dd7a1c8 100644 --- a/TAO/tao/Messaging/Messaging_Loader.h +++ b/TAO/tao/Messaging/Messaging_Loader.h @@ -29,10 +29,10 @@ class TAO_Messaging_Export TAO_Messaging_Loader : public ACE_Service_Object { public: /// Constructor. - TAO_Messaging_Loader (void); + TAO_Messaging_Loader (); /// Destructor. - virtual ~TAO_Messaging_Loader (void); + virtual ~TAO_Messaging_Loader (); /// Initialize the Messaging loader hooks. virtual int init (int argc, ACE_TCHAR* []); diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index a3aadf66749..6bb83e9eee6 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -34,13 +34,13 @@ TAO_RelativeRoundtripTimeoutPolicy::TAO_RelativeRoundtripTimeoutPolicy ( } TimeBase::TimeT -TAO_RelativeRoundtripTimeoutPolicy::relative_expiry (void) +TAO_RelativeRoundtripTimeoutPolicy::relative_expiry () { return this->relative_expiry_; } CORBA::PolicyType -TAO_RelativeRoundtripTimeoutPolicy::policy_type (void) +TAO_RelativeRoundtripTimeoutPolicy::policy_type () { return Messaging::RELATIVE_RT_TIMEOUT_POLICY_TYPE; } @@ -121,7 +121,7 @@ TAO_RelativeRoundtripTimeoutPolicy::create (const CORBA::Any& val) } TAO_RelativeRoundtripTimeoutPolicy * -TAO_RelativeRoundtripTimeoutPolicy::clone (void) const +TAO_RelativeRoundtripTimeoutPolicy::clone () const { TAO_RelativeRoundtripTimeoutPolicy *copy = 0; ACE_NEW_RETURN (copy, @@ -131,7 +131,7 @@ TAO_RelativeRoundtripTimeoutPolicy::clone (void) const } CORBA::Policy_ptr -TAO_RelativeRoundtripTimeoutPolicy::copy (void) +TAO_RelativeRoundtripTimeoutPolicy::copy () { // Future policy implementors: notice how the following code is // exception safe! @@ -145,12 +145,12 @@ TAO_RelativeRoundtripTimeoutPolicy::copy (void) } void -TAO_RelativeRoundtripTimeoutPolicy::destroy (void) +TAO_RelativeRoundtripTimeoutPolicy::destroy () { } TAO_Cached_Policy_Type -TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type (void) const +TAO_RelativeRoundtripTimeoutPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_RELATIVE_ROUNDTRIP_TIMEOUT; } @@ -200,7 +200,7 @@ TAO_Sync_Scope_Policy::TAO_Sync_Scope_Policy (const TAO_Sync_Scope_Policy &rhs) } CORBA::PolicyType -TAO_Sync_Scope_Policy::policy_type (void) +TAO_Sync_Scope_Policy::policy_type () { return Messaging::SYNC_SCOPE_POLICY_TYPE; } @@ -268,7 +268,7 @@ TAO_Sync_Scope_Policy::create (const CORBA::Any& val) } TAO_Sync_Scope_Policy * -TAO_Sync_Scope_Policy::clone (void) const +TAO_Sync_Scope_Policy::clone () const { TAO_Sync_Scope_Policy *copy = 0; ACE_NEW_RETURN (copy, @@ -278,13 +278,13 @@ TAO_Sync_Scope_Policy::clone (void) const } Messaging::SyncScope -TAO_Sync_Scope_Policy::synchronization (void) +TAO_Sync_Scope_Policy::synchronization () { return this->synchronization_; } CORBA::Policy_ptr -TAO_Sync_Scope_Policy::copy (void) +TAO_Sync_Scope_Policy::copy () { TAO_Sync_Scope_Policy *servant = 0; ACE_NEW_THROW_EX (servant, @@ -295,11 +295,11 @@ TAO_Sync_Scope_Policy::copy (void) } void -TAO_Sync_Scope_Policy::destroy (void) +TAO_Sync_Scope_Policy::destroy () { } TAO_Cached_Policy_Type -TAO_Sync_Scope_Policy::_tao_cached_type (void) const +TAO_Sync_Scope_Policy::_tao_cached_type () const { return TAO_CACHED_POLICY_SYNC_SCOPE; } diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index ba8ad68fcc5..27901cb7115 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -57,22 +57,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of @c this. - virtual TAO_RelativeRoundtripTimeoutPolicy *clone (void) const; + virtual TAO_RelativeRoundtripTimeoutPolicy *clone () const; // = The Messaging::RelativeRoundtripTimeoutPolicy methods - virtual TimeBase::TimeT relative_expiry (void); + virtual TimeBase::TimeT relative_expiry (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); /// Change the CORBA representation to the ACE representation. void set_time_value (ACE_Time_Value &time_value); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute @@ -117,22 +117,22 @@ public: static CORBA::Policy_ptr create (const CORBA::Any& val); /// Returns a copy of <this>. - virtual TAO_Sync_Scope_Policy *clone (void) const; + virtual TAO_Sync_Scope_Policy *clone () const; // = The Messaging::SyncScopePolicy methods. - virtual Messaging::SyncScope synchronization (void); + virtual Messaging::SyncScope synchronization (); void get_synchronization (Messaging::SyncScope &synchronization) const; - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); // Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; private: /// The attribute diff --git a/TAO/tao/Muxed_TMS.h b/TAO/tao/Muxed_TMS.h index c31dbb46898..58bbe6fdbf3 100644 --- a/TAO/tao/Muxed_TMS.h +++ b/TAO/tao/Muxed_TMS.h @@ -51,11 +51,11 @@ public: TAO_Muxed_TMS (TAO_Transport *transport); /// Destructor. - virtual ~TAO_Muxed_TMS (void); + virtual ~TAO_Muxed_TMS (); /// Generate and return an unique request id for the current /// invocation. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); // = Please read the documentation in the TAO_Transport_Mux_Strategy // class. @@ -66,10 +66,10 @@ public: virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms); virtual int reply_timed_out (CORBA::ULong request_id); - virtual bool idle_after_send (void); - virtual bool idle_after_reply (void); - virtual void connection_closed (void); - virtual bool has_request (void); + virtual bool idle_after_send (); + virtual bool idle_after_reply (); + virtual void connection_closed (); + virtual bool has_request (); private: void operator= (const TAO_Muxed_TMS &); @@ -97,7 +97,7 @@ private: /// Table of <Request ID, Reply Dispatcher> pairs. REQUEST_DISPATCHER_TABLE dispatcher_table_; - int clear_cache_i (void); + int clear_cache_i (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/NVList_Adapter.h b/TAO/tao/NVList_Adapter.h index 22d33393918..7b961a81f0e 100644 --- a/TAO/tao/NVList_Adapter.h +++ b/TAO/tao/NVList_Adapter.h @@ -40,7 +40,7 @@ namespace CORBA class TAO_Export TAO_NVList_Adapter : public ACE_Service_Object { public: - virtual ~TAO_NVList_Adapter (void); + virtual ~TAO_NVList_Adapter (); virtual void create_list (CORBA::Long count, CORBA::NVList_ptr &new_list) = 0; diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index 96650f39713..f9645906948 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -171,18 +171,18 @@ namespace CORBA class TAO_Export InvalidName : public CORBA::UserException { public: - InvalidName (void); + InvalidName (); InvalidName (const InvalidName &); - ~InvalidName (void); + ~InvalidName (); InvalidName &operator= (const InvalidName &); static InvalidName *_downcast (CORBA::Exception *); - static CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (); - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode (TAO_OutputCDR &) const; @@ -209,10 +209,10 @@ namespace CORBA /// Returns a pointer to a nil ORB, i.e., an non-existent ORB. This /// can be used for initialization or in comparisons. - static CORBA::ORB_ptr _nil (void); + static CORBA::ORB_ptr _nil (); /// Return this ORB's ORBid. - char * id (void); + char * id (); /** * Turn a string-ified object reference back into an object @@ -284,7 +284,7 @@ namespace CORBA void get_next_response (CORBA::Request_ptr &req); - CORBA::Boolean poll_next_response (void); + CORBA::Boolean poll_next_response (); /// The ORB TypeCode creation functions. @@ -381,7 +381,7 @@ namespace CORBA * If an error occurs during initialization or at runtime, a CORBA * system exception will be thrown. */ - void run (void); + void run (); /** * Instructs the ORB to initialize itself and run its event loop in @@ -417,7 +417,7 @@ namespace CORBA /// Returns an indication of whether the ORB needs to perform some /// work. - CORBA::Boolean work_pending (void); + CORBA::Boolean work_pending (); /// Returns an indication of whether the ORB needs to perform some /// work but will look for work pending for no more than the @@ -434,7 +434,7 @@ namespace CORBA * is not present; this behavior can be modified by passing an * appropriate @c ACE_Time_Value as described in run(). **/ - void perform_work (void); + void perform_work (); void perform_work (ACE_Time_Value &tv); void perform_work (ACE_Time_Value *tv); @@ -460,7 +460,7 @@ namespace CORBA * the ORB in one thread and trying to service a request in another * thread are not well defined. TAO does not support such cases. */ - void destroy (void); + void destroy (); /** * This method acts as a mini-bootstrapping Naming Service, which is @@ -492,7 +492,7 @@ namespace CORBA /// Returns a sequence of ObjectIds that lists which objects have /// references available via the initial references mechanism. - CORBA::ORB::ObjectIdList_ptr list_initial_services (void); + CORBA::ORB::ObjectIdList_ptr list_initial_services (); #if !defined(CORBA_E_MICRO) CORBA::Policy_ptr create_policy (CORBA::PolicyType type, @@ -510,18 +510,18 @@ namespace CORBA #endif /// Reference counting... - unsigned long _incr_refcount (void); - unsigned long _decr_refcount (void); - unsigned long _refcount (void) const; + unsigned long _incr_refcount (); + unsigned long _decr_refcount (); + unsigned long _refcount () const; /// Set the IOR flag. void _use_omg_ior_format (CORBA::Boolean ior); /// Get the IOR flag. - CORBA::Boolean _use_omg_ior_format (void); + CORBA::Boolean _use_omg_ior_format (); /// Get the ORB core. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Factory method that creates an ORB. static CORBA::ORB_ptr _tao_make_ORB (TAO_ORB_Core * orb_core); @@ -532,7 +532,7 @@ namespace CORBA typedef ORB_out _out_type; /// Get the Timeout value - ACE_Time_Value *get_timeout (void); + ACE_Time_Value *get_timeout (); protected: // We must be created via the @c CORBA::ORB_init() function. @@ -543,13 +543,13 @@ namespace CORBA * Protected destructor to enforce proper memory management * through the reference counting mechanism. */ - ~ORB (void); + ~ORB (); /// Resolve the Policy Manager for this ORB. - CORBA::Object_ptr resolve_policy_manager (void); + CORBA::Object_ptr resolve_policy_manager (); /// Resolve the Policy Current for this thread. - CORBA::Object_ptr resolve_policy_current (void); + CORBA::Object_ptr resolve_policy_current (); private: /// Resolve the given service based on the service ID. @@ -568,7 +568,7 @@ namespace CORBA /// Check if ORB has shutdown. If it has, throw the appropriate /// exception. - void check_shutdown (void); + void check_shutdown (); /// Set the timeout value void set_timeout (ACE_Time_Value * timeout); diff --git a/TAO/tao/ORBInitializer_Registry_Adapter.h b/TAO/tao/ORBInitializer_Registry_Adapter.h index 69b2f23f059..7c973c2b44f 100644 --- a/TAO/tao/ORBInitializer_Registry_Adapter.h +++ b/TAO/tao/ORBInitializer_Registry_Adapter.h @@ -46,7 +46,7 @@ namespace TAO : public ACE_Service_Object { public: - virtual ~ORBInitializer_Registry_Adapter (void); + virtual ~ORBInitializer_Registry_Adapter (); /// Register an ORBInitializer with the underlying ORBInitializer /// array. diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 4437dc95601..c7a11210b3c 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -171,7 +171,7 @@ public: TAO_ORB_Core (const char* id, ACE_Intrusive_Auto_Ptr<ACE_Service_Gestalt> g); /// Accessor for the ORB parameters. - TAO_ORB_Parameters *orb_params (void); + TAO_ORB_Parameters *orb_params (); /** * @todo @@ -186,46 +186,46 @@ public: */ /// Accessor to the POA current. //@{ - CORBA::Object_ptr poa_current(void); + CORBA::Object_ptr poa_current(); //@} /// Get the connector registry - TAO_Connector_Registry *connector_registry (void); + TAO_Connector_Registry *connector_registry (); /// Get the IOR parser registry - TAO_Parser_Registry *parser_registry (void); + TAO_Parser_Registry *parser_registry (); /// Return pointer to the policy factory registry associated with /// this ORB core. - TAO::PolicyFactory_Registry_Adapter *policy_factory_registry (void); + TAO::PolicyFactory_Registry_Adapter *policy_factory_registry (); /// Return pointer to the orb initializer registry associated with /// this ORB core. Tries to load the PI library if it is not loaded /// yet - TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry (void); + TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry (); TAO_ZIOP_Adapter *ziop_adapter () const; void ziop_adapter (TAO_ZIOP_Adapter *adapter); - TAO_Service_Context_Registry &service_context_registry (void); + TAO_Service_Context_Registry &service_context_registry (); /// Get the protocol factories - TAO_ProtocolFactorySet *protocol_factories (void); + TAO_ProtocolFactorySet *protocol_factories (); /// Get pointer to the ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Wrappers that forward the request to the concurrency strategy. - ACE_Reactor *reactor (void); + ACE_Reactor *reactor (); /// Get the ACE_Thread_Manager - ACE_Thread_Manager *thr_mgr (void); + ACE_Thread_Manager *thr_mgr (); /// Return the RootPOA, or try to load it if not initialized already. - CORBA::Object_ptr root_poa (void); + CORBA::Object_ptr root_poa (); /// Get the adapter registry - TAO_Adapter_Registry &adapter_registry (void); + TAO_Adapter_Registry &adapter_registry (); /// @name Collocation Strategies as configured by the user //@{ @@ -250,17 +250,17 @@ public: /// Set/get the collocation flags //@{ void optimize_collocation_objects (CORBA::Boolean opt); - CORBA::Boolean optimize_collocation_objects (void) const; + CORBA::Boolean optimize_collocation_objects () const; void use_global_collocation (CORBA::Boolean opt); - CORBA::Boolean use_global_collocation (void) const; + CORBA::Boolean use_global_collocation () const; - CORBA::ULong get_collocation_strategy (void) const; + CORBA::ULong get_collocation_strategy () const; //@} /// Get the adapter named "RootPOA" and cache the result, this is an /// optimization for the POA. - TAO_Adapter *poa_adapter (void); + TAO_Adapter *poa_adapter (); /** * @name Access to Factories @@ -272,31 +272,31 @@ public: */ //@{ /// Returns pointer to the resource factory. - TAO_Resource_Factory *resource_factory (void); + TAO_Resource_Factory *resource_factory (); /// Returns pointer to the factory for creating gui resources - TAO::GUIResource_Factory *gui_resource_factory (void); + TAO::GUIResource_Factory *gui_resource_factory (); /// Returns pointer to the client factory. - TAO_Client_Strategy_Factory *client_factory (void); + TAO_Client_Strategy_Factory *client_factory (); /// Returns pointer to the server factory. - TAO_Server_Strategy_Factory *server_factory (void); + TAO_Server_Strategy_Factory *server_factory (); /// Returns pointer to the Protocols_Hooks. - TAO_Protocols_Hooks *protocols_hooks (void); + TAO_Protocols_Hooks *protocols_hooks (); /// Returns a pointer to the Thread Lane Resources Manager. - TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (void); + TAO_Thread_Lane_Resources_Manager &thread_lane_resources_manager (); /// Returns a pointer to the Collocation Resolver. - TAO_Collocation_Resolver &collocation_resolver (void); + TAO_Collocation_Resolver &collocation_resolver (); /// Returns a pointer to the Stub factory. - TAO_Stub_Factory *stub_factory (void); + TAO_Stub_Factory *stub_factory (); /// Returns a pointer to the endpoint selector factory. - TAO_Endpoint_Selector_Factory *endpoint_selector_factory (void); + TAO_Endpoint_Selector_Factory *endpoint_selector_factory (); //@} @@ -315,41 +315,41 @@ public: const char *network_priority_protocols_hooks_name); /// Gets the value of TAO_ORB_Core::protocols_hooks__ - TAO_Protocols_Hooks * get_protocols_hooks (void); + TAO_Protocols_Hooks * get_protocols_hooks (); /// Gets the value of TAO_ORB_Core::network_priority_protocols_hooks__ TAO_Network_Priority_Protocols_Hooks * - get_network_priority_protocols_hooks (void); + get_network_priority_protocols_hooks (); /// Sets the value of TAO_ORB_Core::dynamic_adapter_name_. static void dynamic_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::dynamic_adapter_name_. - static const char *dynamic_adapter_name (void); + static const char *dynamic_adapter_name (); /// Sets the value of TAO_ORB_Core::ifr_client_adapter_name_. static void ifr_client_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::ifr_client_adapter_name_. - static const char *ifr_client_adapter_name (void); + static const char *ifr_client_adapter_name (); /// Sets the value of TAO_ORB_Core::typecodefactory_adapter_name_. static void typecodefactory_adapter_name (const char *name); /// Gets the value of TAO_ORB_Core::typecodefactory_adapter_name_. - static const char *typecodefactory_adapter_name (void); + static const char *typecodefactory_adapter_name (); /// Sets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_. static void iorinterceptor_adapter_factory_name (const char *name); /// Gets the value of TAO_ORB_Core::iorinterceptor_adapter_factory_name_. - static const char *iorinterceptor_adapter_factory_name (void); + static const char *iorinterceptor_adapter_factory_name (); /// Sets the value of TAO_ORB_Core::valuetype_adapter_factory_name. static void valuetype_adapter_factory_name (const char *name); /// Gets the value of TAO_ORB_Core::valuetype_adapter_factory_name. - static const char *valuetype_adapter_factory_name (void); + static const char *valuetype_adapter_factory_name (); /// See if we have a collocated address, if yes, return the POA /// associated with the address. @@ -358,46 +358,46 @@ public: /// This allocator is always TSS and has no locks. It is intended /// for allocating the ACE_Data_Blocks used in *outgoing* CDR /// streams. - ACE_Allocator *output_cdr_dblock_allocator (void); + ACE_Allocator *output_cdr_dblock_allocator (); /// This allocator is always TSS and has no locks. It is intended /// for allocating the buffers used in *outgoing* CDR streams. - ACE_Allocator *output_cdr_buffer_allocator (void); + ACE_Allocator *output_cdr_buffer_allocator (); /// This allocator is always TSS and has no locks. It is intended /// for allocating the ACE_Data_Blocks used in *outgoing* CDR /// streams. - ACE_Allocator *output_cdr_msgblock_allocator (void); + ACE_Allocator *output_cdr_msgblock_allocator (); /// This allocator is global, may or may not have locks. It is /// intended for allocating the ACE_Data_Blocks used in *incoming* /// CDR streams. - ACE_Allocator *input_cdr_dblock_allocator (void); + ACE_Allocator *input_cdr_dblock_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used in *incoming* CDR streams. - ACE_Allocator *input_cdr_buffer_allocator (void); + ACE_Allocator *input_cdr_buffer_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used in *incoming* CDR streams. - ACE_Allocator *input_cdr_msgblock_allocator (void); + ACE_Allocator *input_cdr_msgblock_allocator (); /// This allocator is always global and has no locks. It is intended /// for allocating the buffers used to queue messages in /// transports. - ACE_Allocator *transport_message_buffer_allocator (void); + ACE_Allocator *transport_message_buffer_allocator (); /// The Message Blocks used for input CDRs must have appropriate /// locking strategies. ACE_Data_Block *create_input_cdr_data_block (size_t size); /// Return the locking strategy used for the data blocks. - ACE_Lock *locking_strategy (void); + ACE_Lock *locking_strategy (); #if (TAO_HAS_CORBA_MESSAGING == 1) /// Accessor method for the default_policies_ - TAO_Policy_Set *get_default_policies (void); + TAO_Policy_Set *get_default_policies (); /// Get a policy. First, check the ORB-level Policy Manager, then /// check the ORB defaults. @@ -437,19 +437,19 @@ public: * tradeoffs and take a decision. */ //@{ - CORBA::Environment *default_environment (void) const; + CORBA::Environment *default_environment () const; void default_environment (CORBA::Environment*); //@} #if (TAO_HAS_CORBA_MESSAGING == 1) /// Return the Policy_Manager for this ORB. - TAO_Policy_Manager *policy_manager (void); + TAO_Policy_Manager *policy_manager (); /// Accesors to the policy current, this object should be kept in /// TSS storage. The POA has to reset the policy current object on /// every upcall. - TAO_Policy_Current &policy_current (void); + TAO_Policy_Current &policy_current (); #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ @@ -540,7 +540,7 @@ public: Messaging::SyncScope &scope); /// Return the default sync scope configured for this ORB - Messaging::SyncScope default_sync_scope (void); + Messaging::SyncScope default_sync_scope (); /// Handle to the factory for protocols_hooks_.. TAO_Protocols_Hooks *protocols_hooks_; @@ -549,7 +549,7 @@ public: TAO_Network_Priority_Protocols_Hooks *network_priority_protocols_hooks_; /// Obtain the TSS resources of this orb. - TAO_ORB_Core_TSS_Resources* get_tss_resources (void); + TAO_ORB_Core_TSS_Resources* get_tss_resources (); /// Obtain the TSS resource in the given slot. void* get_tss_resource (size_t slot_id); @@ -567,13 +567,13 @@ public: void tss_cleanup (ACE_Array_Base<void *> &ts_objects); /// Get access to the leader_follower class. - TAO_Leader_Follower &leader_follower (void); + TAO_Leader_Follower &leader_follower (); /// Get access to the leader follower strategy. - TAO_LF_Strategy &lf_strategy (void); + TAO_LF_Strategy &lf_strategy (); /// Get access to the thread lane resources. - TAO_Thread_Lane_Resources &lane_resources (void); + TAO_Thread_Lane_Resources &lane_resources (); /// Run the event loop. int run (ACE_Time_Value *tv, int perform_work); @@ -582,13 +582,13 @@ public: void shutdown (CORBA::Boolean wait_for_completion); /// Get the shutdown flag value - bool has_shutdown (void) const; + bool has_shutdown () const; /// Shutdown the ORB and free resources - void destroy (void); + void destroy (); /// Check if ORB has shutdown. If it has, throw an exception. - void check_shutdown (void); + void check_shutdown (); /// Returns the @a timeout value used by the server threads to poll /// the shutdown flag. If the return value is zero then the server @@ -628,53 +628,53 @@ public: CORBA::Long reinitialize_object (TAO_Stub *stub); /// Return ORBid string. - const char *orbid (void) const; + const char *orbid () const; /// Set/Get the IOR of the Implementation Repository service. //@{ - CORBA::Object_ptr implrepo_service (void); + CORBA::Object_ptr implrepo_service (); void implrepo_service (const CORBA::Object_ptr ir); //@} /// Do we attempt to register with the Implementation Repository - CORBA::Boolean use_implrepo (void); + CORBA::Boolean use_implrepo (); /// Do we put the ImR's endpoints into persistent object references we create - CORBA::Boolean imr_endpoints_in_ior (void); + CORBA::Boolean imr_endpoints_in_ior (); /// Resolve the TypeCodeFactory DLL. - CORBA::Object_ptr resolve_typecodefactory (void); + CORBA::Object_ptr resolve_typecodefactory (); #if TAO_HAS_INTERCEPTORS == 1 /// Resolve the PICurrent. - CORBA::Object_ptr resolve_picurrent (void); + CORBA::Object_ptr resolve_picurrent (); #endif /* TAO_HAS_INTERCEPTORS == 1 */ /// Resolve POA Current. - CORBA::Object_ptr resolve_poa_current (void); + CORBA::Object_ptr resolve_poa_current (); /// Resolve the CodecFactory DLL. - CORBA::Object_ptr resolve_codecfactory (void); + CORBA::Object_ptr resolve_codecfactory (); /// Resolve the Compression DLL. - CORBA::Object_ptr resolve_compression_manager (void); + CORBA::Object_ptr resolve_compression_manager (); /// Resolve the Dynamic Any Factory - CORBA::Object_ptr resolve_dynanyfactory (void); + CORBA::Object_ptr resolve_dynanyfactory (); /// Resolve the IOR Manipulation reference for this ORB. - CORBA::Object_ptr resolve_ior_manipulation (void); + CORBA::Object_ptr resolve_ior_manipulation (); - TAO_ZIOP_Adapter* ziop_adapter_i (void); + TAO_ZIOP_Adapter* ziop_adapter_i (); /// Resolve the IOR Table reference for this ORB. - CORBA::Object_ptr resolve_ior_table (void); + CORBA::Object_ptr resolve_ior_table (); /// Resolve the Async IOR Table reference for this ORB. - CORBA::Object_ptr resolve_async_ior_table (void); + CORBA::Object_ptr resolve_async_ior_table (); /// Resolve the Monitor reference for this ORB. - CORBA::Object_ptr resolve_monitor (void); + CORBA::Object_ptr resolve_monitor (); /// Resolve an initial reference via the -ORBInitRef and // -ORBDefaultInitRef options. @@ -682,20 +682,20 @@ public: #if defined (TAO_HAS_CORBA_MESSAGING) && TAO_HAS_CORBA_MESSAGING != 0 /// Resolve the RT ORB reference for this ORB. - CORBA::Object_ptr resolve_rt_orb (void); + CORBA::Object_ptr resolve_rt_orb (); #endif /// Resolve the RT Current flyweight for this ORB. /// Return server_id string. - const char *server_id (void) const; + const char *server_id () const; /// List all the service known by the ORB - CORBA::ORB_ObjectIdList *list_initial_references (void); + CORBA::ORB_ObjectIdList *list_initial_references (); /// Reference counting... - unsigned long _incr_refcnt (void); - unsigned long _decr_refcnt (void); - unsigned long _refcnt (void) const; + unsigned long _incr_refcnt (); + unsigned long _decr_refcnt (); + unsigned long _refcnt () const; /// Register the handle of an open connection with the ORB Core /// handle set. This handle set will be used to explicitly remove @@ -748,12 +748,12 @@ public: CORBA::ULong hash_service (TAO_Profile *this_p, CORBA::ULong max); /// Return a reference to the Fault Tolerant service object. - TAO_Fault_Tolerance_Service &fault_tolerance_service (void); + TAO_Fault_Tolerance_Service &fault_tolerance_service (); /// Transmit the entire TAG_FT_GROUP component data from a server IOGR as /// a FT_GROUP_VERSION tagged service context on requests to that IOGR instead /// of just the group version. - CORBA::Boolean ft_send_extended_sc (void); + CORBA::Boolean ft_send_extended_sc (); /// Raise a comm failure exception if a service is not loaded, else /// delegate to the service to see what the service has to do for @@ -782,7 +782,7 @@ public: #if TAO_HAS_INTERCEPTORS == 1 /// Return a pointer to the cached TAO::PICurrent object. - CORBA::Object_ptr pi_current (void); + CORBA::Object_ptr pi_current (); /// Set the pointer to the cached TAO::PICurrent object. void pi_current (CORBA::Object_ptr current); @@ -807,11 +807,11 @@ public: /// Get the Client Request Interceptor adapter. /// Will not create a new one if not available yet. - TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (void); + TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter (); /// Get the Server Request Interceptor adapter. /// Will not create a new one if not available yet. - TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter (void); + TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter (); #endif /* TAO_HAS_INTERCEPTORS */ @@ -820,7 +820,7 @@ public: //@} /// Return the valuetype adapter - TAO_Valuetype_Adapter *valuetype_adapter (void); + TAO_Valuetype_Adapter *valuetype_adapter (); #if !defined(CORBA_E_MICRO) /// Value factory operations (CORBA 2.3 ptc/98-10-05 Ch. 4.2 p.4-7) @@ -839,25 +839,25 @@ public: /// Get the IOR Interceptor adapter. If not created, this method will try /// to create one. - TAO_IORInterceptor_Adapter *ior_interceptor_adapter (void); + TAO_IORInterceptor_Adapter *ior_interceptor_adapter (); /// Set and Get methods to indicate whether a BiDir IIOP policy has /// been set in the POA. /// @note At present, the value will be true even if one of the POA's /// is set with the Bi Dir GIOP policy. - CORBA::Boolean bidir_giop_policy (void); + CORBA::Boolean bidir_giop_policy (); void bidir_giop_policy (CORBA::Boolean); /// Return the table that maps object key/name to de-stringified /// object reference. It is needed for supporting local objects in /// the resolve_initial_references() mechanism. - TAO_Object_Ref_Table &object_ref_table (void); + TAO_Object_Ref_Table &object_ref_table (); /// Acceessor to the table that stores the object_keys. - TAO::ObjectKey_Table &object_key_table (void); + TAO::ObjectKey_Table &object_key_table (); /// Return the current request dispatcher strategy. - TAO_Request_Dispatcher *request_dispatcher (void); + TAO_Request_Dispatcher *request_dispatcher (); /// Set a new request dispatcher. The ORB Core retains ownership /// of the request dispatcher once it gets it. Currently, this only @@ -876,15 +876,15 @@ public: * The flushing strategies are stateless, therefore, there is only * one per ORB. */ - TAO_Flushing_Strategy *flushing_strategy (void); + TAO_Flushing_Strategy *flushing_strategy (); /// Get Code Set Manager - TAO_Codeset_Manager *codeset_manager (void); + TAO_Codeset_Manager *codeset_manager (); typedef ACE_Array_Map<ACE_CString, ACE_CString> InitRefMap; /// Return a pointer to the -ORBInitRef map. - InitRefMap * init_ref_map (void); + InitRefMap * init_ref_map (); /// Set the ORB related to the orb_id as the default ORB and not the /// ORB that is first binded in the ORB Table @@ -918,7 +918,7 @@ protected: /// Destructor is protected since the ORB Core is a reference /// counted object. - ~TAO_ORB_Core (void); + ~TAO_ORB_Core (); /// Initialize the guts of the ORB Core. It is intended that this be /// called by CORBA::ORB_init(). @@ -926,7 +926,7 @@ protected: /// Final termination hook, typically called by CORBA::ORB's /// destructor. - int fini (void); + int fini (); /// Routine that creates a ACE_Data_Block given the lock and allocators. ACE_Data_Block *create_data_block_i (size_t size, @@ -935,48 +935,48 @@ protected: ACE_Lock *lock); /// Obtain and cache the typecode factory object reference. - void resolve_typecodefactory_i (void); + void resolve_typecodefactory_i (); /// Obtain and cache the poa current. - void resolve_poa_current_i (void); + void resolve_poa_current_i (); #if TAO_HAS_INTERCEPTORS == 1 /// Obtain and cache the picurrent factory object reference. - void resolve_picurrent_i (void); + void resolve_picurrent_i (); /// Get the Client Request Interceptor adapter. /// If not created, this method will try to create one if needed. - TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter_i (void); + TAO::ClientRequestInterceptor_Adapter *clientrequestinterceptor_adapter_i (); /// Get the Server Request Interceptor adapter. /// If not created, this method will try to create one if needed. - TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter_i (void); + TAO::ServerRequestInterceptor_Adapter *serverrequestinterceptor_adapter_i (); #endif /* TAO_HAS_INTERCEPTORS */ /// Obtain and cache the codec factory object reference. - void resolve_codecfactory_i (void); + void resolve_codecfactory_i (); /// Obtain and cache the compression manager object reference. - void resolve_compression_manager_i (void); + void resolve_compression_manager_i (); /// Obtain and cache the dynamic any factory object reference. - void resolve_dynanyfactory_i (void); + void resolve_dynanyfactory_i (); /// Obtain and cache the IORManipulation factory object reference. - void resolve_iormanipulation_i (void); + void resolve_iormanipulation_i (); /// Obtain and cache the Monitor object reference. - void resolve_monitor_i (void); + void resolve_monitor_i (); /// Search the Dynamic service list for well known services that has /// callbacks which can be dynamically loaded. - void services_callbacks_init (void); + void services_callbacks_init (); /// Helper method that invokes Interceptor::destroy() on all /// registered interceptors when ORB::destroy() is called. Prevents /// exceptions from propagating up the call chain. - void destroy_interceptors (void); + void destroy_interceptors (); /// Pointer to the list of protocol loaded into this ORB instance. /// Helper method to hold the common code part for -ORBEndpoint and @@ -986,11 +986,11 @@ protected: /// Return pointer to the policy factory registry associated with /// this ORB core. - TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_i (void); + TAO::PolicyFactory_Registry_Adapter *policy_factory_registry_i (); /// Return pointer to the orb initializer registry associated with /// this ORB core. - TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (void); + TAO::ORBInitializer_Registry_Adapter *orbinitializer_registry_i (); /// Common code from ::initialize_object and ::reinitialize_object CORBA::Long initialize_object_i (TAO_Stub *the_stub, @@ -1005,10 +1005,10 @@ private: //@} /// Obtain and cache the ior table object reference. - void resolve_ior_table_i (void); + void resolve_ior_table_i (); /// Obtain and cache the async ior table object reference. - void resolve_async_ior_table_i (void); + void resolve_async_ior_table_i (); /// Checks to see whether collocation optimizations have to be /// applied on objects in the @a other_orb @@ -1306,7 +1306,7 @@ class TAO_Export TAO_ORB_Core_Static_Resources : public ACE_Service_Object public: /// Return the context-specific singleton instance. - static TAO_ORB_Core_Static_Resources* instance (void); + static TAO_ORB_Core_Static_Resources* instance (); public: /** @@ -1376,7 +1376,7 @@ public: //private: /// Constructor. - TAO_ORB_Core_Static_Resources (void); + TAO_ORB_Core_Static_Resources (); TAO_ORB_Core_Static_Resources& operator= (const TAO_ORB_Core_Static_Resources&); @@ -1392,7 +1392,7 @@ private: /// Obtain an instance of the first ORB core registered in the ORB /// table. -TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (void); +TAO_Export TAO_ORB_Core * TAO_ORB_Core_instance (); // **************************************************************** diff --git a/TAO/tao/ORB_Core_Auto_Ptr.h b/TAO/tao/ORB_Core_Auto_Ptr.h index ec7eb332909..0b7a3f6f6a3 100644 --- a/TAO/tao/ORB_Core_Auto_Ptr.h +++ b/TAO/tao/ORB_Core_Auto_Ptr.h @@ -45,7 +45,7 @@ public: explicit TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core *p = 0); TAO_ORB_Core_Auto_Ptr (TAO_ORB_Core_Auto_Ptr &ap); TAO_ORB_Core_Auto_Ptr &operator= (TAO_ORB_Core_Auto_Ptr &rhs); - ~TAO_ORB_Core_Auto_Ptr (void); + ~TAO_ORB_Core_Auto_Ptr (); //@} /** @@ -53,8 +53,8 @@ public: */ //@{ TAO_ORB_Core &operator *() const; - TAO_ORB_Core *get (void) const; - TAO_ORB_Core *release (void); + TAO_ORB_Core *get () const; + TAO_ORB_Core *release (); void reset (TAO_ORB_Core *p = 0); TAO_ORB_Core *operator-> () const; //@} diff --git a/TAO/tao/ORB_Core_TSS_Resources.h b/TAO/tao/ORB_Core_TSS_Resources.h index f5c12f9dd32..01e5a60de9c 100644 --- a/TAO/tao/ORB_Core_TSS_Resources.h +++ b/TAO/tao/ORB_Core_TSS_Resources.h @@ -41,13 +41,13 @@ class TAO_Export TAO_ORB_Core_TSS_Resources public: /// Constructor - TAO_ORB_Core_TSS_Resources (void); + TAO_ORB_Core_TSS_Resources (); /// destructor - ~TAO_ORB_Core_TSS_Resources (void); + ~TAO_ORB_Core_TSS_Resources (); /// Cleans TSS resources. - void fini (void); + void fini (); private: diff --git a/TAO/tao/ORB_Table.h b/TAO/tao/ORB_Table.h index c1e5ed0d60e..8841c8d34a3 100644 --- a/TAO/tao/ORB_Table.h +++ b/TAO/tao/ORB_Table.h @@ -67,7 +67,7 @@ namespace TAO * @note See the note in the class description for an explanation * of why this constructor is not protected. */ - ORB_Table (void); + ORB_Table (); typedef ACE_Array_Map<CORBA::String_var, ORB_Core_Ref_Counter, @@ -82,8 +82,8 @@ namespace TAO * @name The canonical ACE_Map methods. */ //@{ - iterator begin (void); - iterator end (void); + iterator begin (); + iterator end (); int bind (const char *orb_id, ::TAO_ORB_Core *orb_core); /// Return @c TAO_ORB_Core corresponding to ORB with given @a @@ -99,10 +99,10 @@ namespace TAO /// Obtain the first ORB for the @c ORB_Core_instance() /// implementation. - ::TAO_ORB_Core * first_orb (void); + ::TAO_ORB_Core * first_orb (); /// Return a unique instance - static ORB_Table * instance (void); + static ORB_Table * instance (); /// Set the ORB related to the orb_id as the default ORB and not the /// ORB that is first binded. @@ -113,10 +113,10 @@ namespace TAO void not_default (char const * orb_id); /// Accessor to the underlying table_ - Table * table (void); + Table * table (); /// Return reference to underlying lock. - TAO_SYNCH_MUTEX & lock (void); + TAO_SYNCH_MUTEX & lock (); private: @@ -158,13 +158,13 @@ namespace TAO public: /// Constructor. - ORB_Core_Ref_Counter (void); + ORB_Core_Ref_Counter (); /// Constructor. ORB_Core_Ref_Counter (::TAO_ORB_Core * core); /// Destructor. - ~ORB_Core_Ref_Counter (void); + ~ORB_Core_Ref_Counter (); /// Copy constructor. ORB_Core_Ref_Counter (ORB_Core_Ref_Counter const & rhs); @@ -173,7 +173,7 @@ namespace TAO void operator= (ORB_Core_Ref_Counter const & rhs); /// ORB_Core pointer accessor. - ::TAO_ORB_Core * core (void) const { return this->core_; } + ::TAO_ORB_Core * core () const { return this->core_; } private: ::TAO_ORB_Core * core_; diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index 92c2e499c85..8f2cb4239da 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -102,7 +102,7 @@ namespace CORBA { public: /// Destructor. - virtual ~Object (void); + virtual ~Object (); /** * @name Spec defined methods @@ -115,7 +115,7 @@ namespace CORBA static CORBA::Object_ptr _duplicate (CORBA::Object_ptr obj); /// Return a NULL object. - static CORBA::Object_ptr _nil (void); + static CORBA::Object_ptr _nil (); /// No-op it is just here to simplify some templates. static CORBA::Object_ptr _narrow (CORBA::Object_ptr obj); @@ -131,7 +131,7 @@ namespace CORBA /// The repository ID for the most derived class, this is an /// implementation method and does no remote invocations! - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; /** * Return a (potentially non-unique) hash value for this object. @@ -152,18 +152,18 @@ namespace CORBA #if (TAO_HAS_MINIMUM_CORBA == 0) - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) /// Get info about the object from the Interface Repository. - virtual InterfaceDef_ptr _get_interface (void); + virtual InterfaceDef_ptr _get_interface (); /// Get info about the object from the Interface Repository. - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); #endif /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #if ! defined (CORBA_E_COMPACT) && ! defined (CORBA_E_MICRO) // DII operations to create a request. @@ -217,7 +217,7 @@ namespace CORBA #endif /* TAO_HAS_CORBA_MESSAGING == 1 */ - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /** * @name Reference Count Management @@ -227,13 +227,13 @@ namespace CORBA */ //@{ /// Increment the reference count. - virtual void _add_ref (void); + virtual void _add_ref (); /// Decrement the reference count. - virtual void _remove_ref (void); + virtual void _remove_ref (); /// Get the refcount - virtual CORBA::ULong _refcount_value (void) const; + virtual CORBA::ULong _refcount_value () const; //@} // Useful for template programming. @@ -251,15 +251,15 @@ namespace CORBA /// Accessor for the cached servant reference held on the stub /// if this object is collocated - virtual TAO_Abstract_ServantBase *_servant (void) const; + virtual TAO_Abstract_ServantBase *_servant () const; /// Is this object collocated with the servant? /// Note this does not return this->is_collocated_ but will instead /// query the underlying stub for its collocation status - virtual CORBA::Boolean _is_collocated (void) const; + virtual CORBA::Boolean _is_collocated () const; /// Is this a local object? - virtual CORBA::Boolean _is_local (void) const; + virtual CORBA::Boolean _is_local () const; /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void*); @@ -272,7 +272,7 @@ namespace CORBA /// Return the object key as an out parameter. Caller should release /// return value when finished with it. - virtual TAO::ObjectKey *_key (void); + virtual TAO::ObjectKey *_key (); /// Constructor Object (TAO_Stub *p, @@ -283,8 +283,8 @@ namespace CORBA Object (IOP::IOR *ior, TAO_ORB_Core *orb_core); /// Get the underlying stub object. - virtual TAO_Stub *_stubobj (void) const; - virtual TAO_Stub *_stubobj (void); + virtual TAO_Stub *_stubobj () const; + virtual TAO_Stub *_stubobj (); /// Set the proxy broker. virtual void _proxy_broker (TAO::Object_Proxy_Broker *proxy_broker); @@ -304,10 +304,10 @@ namespace CORBA #endif /* GEN_OSTREAM_OPS */ /// Accessor to the flag.. - CORBA::Boolean is_evaluated (void) const; + CORBA::Boolean is_evaluated () const; /// Accessor for the ORB_Core.. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Accessors for the underlying IOP::IOR's. /** @@ -315,14 +315,14 @@ namespace CORBA * the IOR. This is useful for cases when one wants to initialize * a new CORBA Object */ - IOP::IOR *steal_ior (void); + IOP::IOR *steal_ior (); - const IOP::IOR &ior (void) const; + const IOP::IOR &ior () const; //@} End of TAO-specific methods.. /// Can this object be stringified? - virtual bool can_convert_to_ior (void) const; + virtual bool can_convert_to_ior () const; /// A hook to allow users to provide custom object stringification. /// @note This method is intended to be used by classes that @@ -331,7 +331,7 @@ namespace CORBA const char* ior_prefix) const; /// Wrapper for _remove_ref(), naming convention for templatizing. - void _decr_refcount (void); + void _decr_refcount (); protected: /// Initializing a local object. @@ -412,7 +412,7 @@ namespace TAO { static CORBA::Object_ptr duplicate (CORBA::Object_ptr); static void release (CORBA::Object_ptr); - static CORBA::Object_ptr nil (void); + static CORBA::Object_ptr nil (); static CORBA::Boolean marshal (const CORBA::Object_ptr p, TAO_OutputCDR & cdr); }; @@ -429,7 +429,7 @@ namespace TAO /// library is present. extern TAO_Export TAO::Object_Proxy_Broker * - (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (void); + (*_TAO_Object_Proxy_Broker_Factory_function_pointer) (); TAO_Export CORBA::Boolean operator<< (TAO_OutputCDR&, const CORBA::Object*); diff --git a/TAO/tao/ObjectKey_Table.h b/TAO/tao/ObjectKey_Table.h index d467e6d2711..55fa8ddcc0c 100644 --- a/TAO/tao/ObjectKey_Table.h +++ b/TAO/tao/ObjectKey_Table.h @@ -87,12 +87,12 @@ namespace TAO { public: /// Default Constructor and destructor.. - ObjectKey_Table (void); + ObjectKey_Table (); - ~ObjectKey_Table (void); + ~ObjectKey_Table (); /// Iterates and unbinds the contents of the table. - int destroy (void); + int destroy (); /// Bind the ObjectKey in the table. /** diff --git a/TAO/tao/Object_Argument_T.h b/TAO/tao/Object_Argument_T.h index 5befb04c321..a2e2937c869 100644 --- a/TAO/tao/Object_Argument_T.h +++ b/TAO/tao/Object_Argument_T.h @@ -41,7 +41,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr arg (void) const; + S_ptr arg () const; protected: S_ptr x_; @@ -67,9 +67,9 @@ namespace TAO { public: In_Object_Clonable_Argument_T (S_ptr x); - virtual ~In_Object_Clonable_Argument_T (void); + virtual ~In_Object_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -94,7 +94,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); private: S_ptr & x_; @@ -118,7 +118,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_out arg (void); + S_out arg (); private: S_ptr & x_; @@ -137,16 +137,16 @@ namespace TAO { public: - Ret_Object_Argument_T (void); + Ret_Object_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); - S_ptr excp (void); - S_ptr retn (void); + S_ptr excp (); + S_ptr retn (); private: S_var x_; diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h index 9854f40b8d0..f0f60ee07bb 100644 --- a/TAO/tao/Object_KeyC.h +++ b/TAO/tao/Object_KeyC.h @@ -84,7 +84,7 @@ namespace TAO > { public: - ObjectKey (void); + ObjectKey (); ObjectKey (CORBA::ULong max); ObjectKey ( CORBA::ULong max, @@ -98,7 +98,7 @@ namespace TAO ObjectKey& operator= (const ObjectKey &) = default; ObjectKey& operator= (ObjectKey &&) = default; #endif /* ACE_HAS_CPP11 */ - ~ObjectKey (void); + ~ObjectKey (); typedef ObjectKey_var _var_type; diff --git a/TAO/tao/Object_Loader.h b/TAO/tao/Object_Loader.h index a40fe96d375..cbed00313fb 100644 --- a/TAO/tao/Object_Loader.h +++ b/TAO/tao/Object_Loader.h @@ -48,7 +48,7 @@ class TAO_Export TAO_Object_Loader : public ACE_Service_Object { public: /// The destructor - virtual ~TAO_Object_Loader (void); + virtual ~TAO_Object_Loader (); /** * Create and activate a new object into the orb. diff --git a/TAO/tao/Object_Proxy_Broker.h b/TAO/tao/Object_Proxy_Broker.h index 8c6057e6e3a..27fc4c656d2 100644 --- a/TAO/tao/Object_Proxy_Broker.h +++ b/TAO/tao/Object_Proxy_Broker.h @@ -50,7 +50,7 @@ namespace TAO { public: /// Destructor - virtual ~Object_Proxy_Broker (void); + virtual ~Object_Proxy_Broker (); virtual CORBA::Boolean _is_a (CORBA::Object_ptr target, const char *logical_type_id) = 0; diff --git a/TAO/tao/Object_Ref_Table.h b/TAO/tao/Object_Ref_Table.h index 4b54007f178..fb7ca8039ae 100644 --- a/TAO/tao/Object_Ref_Table.h +++ b/TAO/tao/Object_Ref_Table.h @@ -56,7 +56,7 @@ public: typedef Table::iterator iterator; /// Constructor - TAO_Object_Ref_Table (void); + TAO_Object_Ref_Table (); /** * Register an object reference with the table, and map the given @@ -78,18 +78,18 @@ public: CORBA::Object_ptr resolve_initial_reference (const char * id); /// Explicitly destroy the contents of the object reference table. - void destroy (void); + void destroy (); /** * @name Forward Iterators */ //@{ - iterator begin (void); - iterator end (void); + iterator begin (); + iterator end (); //@} /// Return the current size of the underlying table. - size_t current_size (void) const; + size_t current_size () const; private: /** diff --git a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h index 9f32df30fed..31f3aa3226e 100644 --- a/TAO/tao/Object_Reference_Const_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Const_Sequence_Element_T.h @@ -45,12 +45,12 @@ public: { } - inline operator object_reference_type * (void) const + inline operator object_reference_type * () const { return *this->element_; } - inline object_reference_type * in (void) const + inline object_reference_type * in () const { return *this->element_; } diff --git a/TAO/tao/Object_Reference_Sequence_Element_T.h b/TAO/tao/Object_Reference_Sequence_Element_T.h index c1d04e108fb..08e283e91e7 100644 --- a/TAO/tao/Object_Reference_Sequence_Element_T.h +++ b/TAO/tao/Object_Reference_Sequence_Element_T.h @@ -89,11 +89,11 @@ public: return *this->element_; } - inline object_reference_type *in (void) const { + inline object_reference_type *in () const { return *this->element_; } - inline object_reference_type *&inout (void) const { + inline object_reference_type *&inout () const { return *this->element_; } diff --git a/TAO/tao/Objref_VarOut_T.h b/TAO/tao/Objref_VarOut_T.h index 95c88afbe54..3d31c1cc941 100644 --- a/TAO/tao/Objref_VarOut_T.h +++ b/TAO/tao/Objref_VarOut_T.h @@ -47,14 +47,14 @@ template <typename T> class TAO_Objref_Var_T : private TAO_Base_var { public: - TAO_Objref_Var_T (void); + TAO_Objref_Var_T (); TAO_Objref_Var_T (T * p) : ptr_ (p) {} TAO_Objref_Var_T (const TAO_Objref_Var_T<T> &); - ~TAO_Objref_Var_T (void); + ~TAO_Objref_Var_T (); TAO_Objref_Var_T<T> & operator= (T *); TAO_Objref_Var_T<T> & operator= (const TAO_Objref_Var_T<T> &); - T * operator-> (void) const; + T * operator-> () const; /// Cast operators. operator T * const & () const; @@ -66,17 +66,17 @@ public: typedef T *& _out_type; typedef T * _retn_type; - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); /// TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: T * ptr_; - void free (void); + void free (); void reset (T *); private: @@ -105,8 +105,8 @@ public: /// Cast operator. operator T *& (); - T *& ptr (void); - T * operator-> (void); + T *& ptr (); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/PI/ClientRequestDetails.h b/TAO/tao/PI/ClientRequestDetails.h index 2aa46394c6a..9907aa92961 100644 --- a/TAO/tao/PI/ClientRequestDetails.h +++ b/TAO/tao/PI/ClientRequestDetails.h @@ -49,8 +49,7 @@ namespace TAO class ClientRequestDetails { public: - - ClientRequestDetails (void); + ClientRequestDetails (); void apply_policies (const CORBA::PolicyList& policies); @@ -61,7 +60,6 @@ namespace TAO bool should_be_processed (bool is_remote_request) const; private: - /// The ProcessingMode setting that can be adjusted via the /// PortableInterceptor::ProcessingModePolicy. PortableInterceptor::ProcessingMode processing_mode_; diff --git a/TAO/tao/PI/ClientRequestInfo.cpp b/TAO/tao/PI/ClientRequestInfo.cpp index fc7a4980394..d2b95eb562e 100644 --- a/TAO/tao/PI/ClientRequestInfo.cpp +++ b/TAO/tao/PI/ClientRequestInfo.cpp @@ -31,7 +31,7 @@ TAO_ClientRequestInfo::TAO_ClientRequestInfo (TAO::Invocation_Base *inv) } void -TAO_ClientRequestInfo::setup_picurrent (void) +TAO_ClientRequestInfo::setup_picurrent () { // Retrieve the thread scope current (no TSS access incurred yet). CORBA::Object_ptr pi_current_obj = @@ -75,7 +75,7 @@ TAO_ClientRequestInfo::get_service_context_i ( } CORBA::Object_ptr -TAO_ClientRequestInfo::target (void) +TAO_ClientRequestInfo::target () { this->check_validity (); @@ -83,7 +83,7 @@ TAO_ClientRequestInfo::target (void) } CORBA::Object_ptr -TAO_ClientRequestInfo::effective_target (void) +TAO_ClientRequestInfo::effective_target () { this->check_validity (); @@ -91,7 +91,7 @@ TAO_ClientRequestInfo::effective_target (void) } IOP::TaggedProfile * -TAO_ClientRequestInfo::effective_profile (void) +TAO_ClientRequestInfo::effective_profile () { this->check_validity (); @@ -128,7 +128,7 @@ TAO_ClientRequestInfo::effective_profile (void) // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO_ClientRequestInfo::received_exception (void) +TAO_ClientRequestInfo::received_exception () { this->check_validity (); @@ -163,7 +163,7 @@ TAO_ClientRequestInfo::received_exception (void) } char * -TAO_ClientRequestInfo::received_exception_id (void) +TAO_ClientRequestInfo::received_exception_id () { this->check_validity (); @@ -309,7 +309,7 @@ TAO_ClientRequestInfo::add_request_service_context ( } CORBA::ULong -TAO_ClientRequestInfo::request_id (void) +TAO_ClientRequestInfo::request_id () { this->check_validity (); @@ -393,7 +393,7 @@ TAO_ClientRequestInfo::request_id (void) } char * -TAO_ClientRequestInfo::operation (void) +TAO_ClientRequestInfo::operation () { this->check_validity (); @@ -401,7 +401,7 @@ TAO_ClientRequestInfo::operation (void) } Dynamic::ParameterList * -TAO_ClientRequestInfo::arguments (void) +TAO_ClientRequestInfo::arguments () { this->check_validity (); @@ -443,7 +443,7 @@ TAO_ClientRequestInfo::parameter_list (Dynamic::ParameterList ¶m_list) } Dynamic::ExceptionList * -TAO_ClientRequestInfo::exceptions (void) +TAO_ClientRequestInfo::exceptions () { this->check_validity (); @@ -481,7 +481,7 @@ TAO_ClientRequestInfo::exception_list (Dynamic::ExceptionList &exception_list) } Dynamic::ContextList * -TAO_ClientRequestInfo::contexts (void) +TAO_ClientRequestInfo::contexts () { this->check_validity (); @@ -489,7 +489,7 @@ TAO_ClientRequestInfo::contexts (void) } Dynamic::RequestContext * -TAO_ClientRequestInfo::operation_context (void) +TAO_ClientRequestInfo::operation_context () { this->check_validity (); @@ -497,7 +497,7 @@ TAO_ClientRequestInfo::operation_context (void) } CORBA::Any * -TAO_ClientRequestInfo::result (void) +TAO_ClientRequestInfo::result () { this->check_validity (); @@ -526,7 +526,7 @@ TAO_ClientRequestInfo::result (CORBA::Any *any) } CORBA::Boolean -TAO_ClientRequestInfo::response_expected (void) +TAO_ClientRequestInfo::response_expected () { this->check_validity (); @@ -534,7 +534,7 @@ TAO_ClientRequestInfo::response_expected (void) } Messaging::SyncScope -TAO_ClientRequestInfo::sync_scope (void) +TAO_ClientRequestInfo::sync_scope () { this->check_validity (); @@ -542,7 +542,7 @@ TAO_ClientRequestInfo::sync_scope (void) } PortableInterceptor::ReplyStatus -TAO_ClientRequestInfo::reply_status (void) +TAO_ClientRequestInfo::reply_status () { this->check_validity (); @@ -558,7 +558,7 @@ TAO_ClientRequestInfo::reply_status (void) } CORBA::Object_ptr -TAO_ClientRequestInfo::forward_reference (void) +TAO_ClientRequestInfo::forward_reference () { this->check_validity (); @@ -606,7 +606,7 @@ TAO_ClientRequestInfo::get_reply_service_context (IOP::ServiceId id) } void -TAO_ClientRequestInfo::check_validity (void) +TAO_ClientRequestInfo::check_validity () { if (this->invocation_ == 0) throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); @@ -619,7 +619,7 @@ TAO_ClientRequestInfo::tao_ft_expiration_time (TimeBase::TimeT time) } TimeBase::TimeT -TAO_ClientRequestInfo::tao_ft_expiration_time (void) const +TAO_ClientRequestInfo::tao_ft_expiration_time () const { return this->invocation_->operation_details ().ft_expiration_time (); } @@ -631,7 +631,7 @@ TAO_ClientRequestInfo::tao_ft_retention_id (CORBA::Long request_id) } CORBA::Long -TAO_ClientRequestInfo::tao_ft_retention_id (void) const +TAO_ClientRequestInfo::tao_ft_retention_id () const { return this->invocation_->operation_details ().ft_retention_id (); } diff --git a/TAO/tao/PI/ClientRequestInfo.h b/TAO/tao/PI/ClientRequestInfo.h index 00f692f7ffc..fe41ecb1f83 100644 --- a/TAO/tao/PI/ClientRequestInfo.h +++ b/TAO/tao/PI/ClientRequestInfo.h @@ -75,34 +75,34 @@ public: /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); /// Return the operation name for the current request. - virtual char * operation (void); + virtual char * operation (); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments (void); + virtual Dynamic::ParameterList * arguments (); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions (void); + virtual Dynamic::ExceptionList * exceptions (); - virtual Dynamic::ContextList * contexts (void); + virtual Dynamic::ContextList * contexts (); - virtual Dynamic::RequestContext * operation_context (void); + virtual Dynamic::RequestContext * operation_context (); /// Return the result of the current request. If there is no return /// value then an Any with tk_void TypeCode is returned. This is /// method is not valid for oneway operations. - virtual CORBA::Any * result (void); + virtual CORBA::Any * result (); /// Returns true for a two-way operation, and false otherwise. - virtual CORBA::Boolean response_expected (void); + virtual CORBA::Boolean response_expected (); /// Return the sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// CORBA::BAD_INV_ORDER exception is thrown. - virtual Messaging::SyncScope sync_scope (void); + virtual Messaging::SyncScope sync_scope (); /// Return the reply status for the current request. /** @@ -110,11 +110,11 @@ public: * SYSTEM_EXCEPTION, USER_EXCEPTION, LOCATION_FORWARD, * TRANSPORT_RETRY, UNKNOWN. */ - virtual PortableInterceptor::ReplyStatus reply_status (void); + virtual PortableInterceptor::ReplyStatus reply_status (); /// If the reply status is PortableInterceptor::LOCATION_FORWARD or /// return the object reference to which the request was forwarded. - virtual CORBA::Object_ptr forward_reference (void); + virtual CORBA::Object_ptr forward_reference (); virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id); @@ -129,23 +129,23 @@ public: /// Return the (initial, non-forwarded, or permanently forwarded) /// object reference of the target. - virtual CORBA::Object_ptr target (void); + virtual CORBA::Object_ptr target (); /// Return the object reference for the current target. The target /// may change in the even of a location forward. - virtual CORBA::Object_ptr effective_target (void); + virtual CORBA::Object_ptr effective_target (); - virtual IOP::TaggedProfile * effective_profile (void); + virtual IOP::TaggedProfile * effective_profile (); /// Return an Any containing the received exception, if any. /// Otherwise, throw a CORBA::BAD_INV_ORDER exception. /** * @note There is no trivial way to extract the exception from an Any. */ - virtual CORBA::Any * received_exception (void); + virtual CORBA::Any * received_exception (); /// Return the repository ID for the received exception. - virtual char * received_exception_id (void); + virtual char * received_exception_id (); /// Return the first IOP::TaggedComponent that matches the given /// IOP::ComponentId in the object reference for the current @@ -176,20 +176,19 @@ public: void tao_ft_expiration_time (TimeBase::TimeT time); /// Get the absolute FT expiration time for this request - TimeBase::TimeT tao_ft_expiration_time (void) const; + TimeBase::TimeT tao_ft_expiration_time () const; /// Set the FT request retention ID for this request. void tao_ft_retention_id (CORBA::Long request_id); /// Get the FT request retention ID for this request. - CORBA::Long tao_ft_retention_id (void) const; + CORBA::Long tao_ft_retention_id () const; /* * End proprietary FT methods. */ private: - bool parameter_list (Dynamic::ParameterList ¶m_list); bool exception_list (Dynamic::ExceptionList &exception_list); @@ -198,11 +197,11 @@ private: /// Check if this ClientRequestInfo object is called within the /// context of a request. - void check_validity (void); + void check_validity (); /// Setup thread scope and request scope /// PortableInterceptor::Current objects. - void setup_picurrent (void); + void setup_picurrent (); /// Helper method to get the request and response service contexts. IOP::ServiceContext *get_service_context_i ( diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp index 6d746b2ea5a..2c4a2db3e32 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.cpp @@ -255,7 +255,7 @@ namespace TAO } void - ClientRequestInterceptor_Adapter_Impl::destroy_interceptors (void) + ClientRequestInterceptor_Adapter_Impl::destroy_interceptors () { this->interceptor_list_.destroy_interceptors (); } diff --git a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h index de01f6487f1..3f1c10c7af9 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Adapter_Impl.h @@ -64,7 +64,7 @@ namespace TAO , public TAO_RequestInterceptor_Adapter_Impl { public: - ClientRequestInterceptor_Adapter_Impl (void); + ClientRequestInterceptor_Adapter_Impl (); /** * @name PortableInterceptor Client Side Interception Points @@ -101,7 +101,7 @@ namespace TAO PortableInterceptor::ClientRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies); - virtual void destroy_interceptors (void); + virtual void destroy_interceptors (); virtual PortableInterceptor::ReplyStatus pi_reply_status ( TAO::Invocation_Base const &invocation_base); diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp index 2b85812b366..10260d213a7 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::ClientRequestInterceptor_Adapter* -TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create (void) +TAO_ClientRequestInterceptor_Adapter_Factory_Impl::create () { TAO::ClientRequestInterceptor_Adapter_Impl* obj = 0; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h index 75b079061b3..2166b6491a8 100644 --- a/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI/ClientRequestInterceptor_Factory_Impl.h @@ -38,7 +38,7 @@ class TAO_PI_Export TAO_ClientRequestInterceptor_Adapter_Factory_Impl : public TAO_ClientRequestInterceptor_Adapter_Factory { public: - virtual TAO::ClientRequestInterceptor_Adapter *create (void); + virtual TAO::ClientRequestInterceptor_Adapter *create (); }; ACE_STATIC_SVC_DECLARE (TAO_ClientRequestInterceptor_Adapter_Factory_Impl) diff --git a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h index 338bfbf4f58..306e088b265 100644 --- a/TAO/tao/PI/DLL_Resident_ORB_Initializer.h +++ b/TAO/tao/PI/DLL_Resident_ORB_Initializer.h @@ -51,13 +51,9 @@ namespace PortableInterceptor const ACE_TCHAR * dll_name); virtual ~DLL_Resident_ORB_Initializer (); - virtual void pre_init ( - ::PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void pre_init (::PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init ( - ::PortableInterceptor::ORBInitInfo_ptr info - ); + virtual void post_init (::PortableInterceptor::ORBInitInfo_ptr info); private: PortableInterceptor::ORBInitializer_var initializer_; diff --git a/TAO/tao/PI/Interceptor_List_T.h b/TAO/tao/PI/Interceptor_List_T.h index 77da79213eb..e8fd6b39c04 100644 --- a/TAO/tao/PI/Interceptor_List_T.h +++ b/TAO/tao/PI/Interceptor_List_T.h @@ -60,7 +60,7 @@ namespace TAO }; /// Constructor. - Interceptor_List (void); + Interceptor_List (); void add_interceptor (InterceptorType_ptr_type i); @@ -68,7 +68,7 @@ namespace TAO void add_interceptor (InterceptorType_ptr_type i, const CORBA::PolicyList& policies); - void destroy_interceptors (void); + void destroy_interceptors (); /// Return the registered interceptor in sequence element @a index. RegisteredInterceptor& registered_interceptor (size_t index); @@ -76,7 +76,7 @@ namespace TAO /// Return the interceptor in sequence element @a index. InterceptorType_ptr_type interceptor (size_t index); - size_t size (void) const; + size_t size () const; private: typedef ACE_Array_Base<RegisteredInterceptor > RegisteredArray; diff --git a/TAO/tao/PI/ORBInitInfo.cpp b/TAO/tao/PI/ORBInitInfo.cpp index 1006abbccec..aba8e1fb7b8 100644 --- a/TAO/tao/PI/ORBInitInfo.cpp +++ b/TAO/tao/PI/ORBInitInfo.cpp @@ -35,7 +35,7 @@ TAO::Objref_Traits<TAO_ORBInitInfo>::release (TAO_ORBInitInfo_ptr p) } TAO_ORBInitInfo_ptr -TAO::Objref_Traits<TAO_ORBInitInfo>::nil (void) +TAO::Objref_Traits<TAO_ORBInitInfo>::nil () { return TAO_ORBInitInfo::_nil (); } @@ -61,12 +61,12 @@ TAO_ORBInitInfo::TAO_ORBInitInfo (TAO_ORB_Core *orb_core, { } -TAO_ORBInitInfo::~TAO_ORBInitInfo (void) +TAO_ORBInitInfo::~TAO_ORBInitInfo () { } CORBA::StringSeq * -TAO_ORBInitInfo::arguments (void) +TAO_ORBInitInfo::arguments () { this->check_validity (); @@ -94,7 +94,7 @@ TAO_ORBInitInfo::arguments (void) } char * -TAO_ORBInitInfo::orb_id (void) +TAO_ORBInitInfo::orb_id () { this->check_validity (); @@ -104,7 +104,7 @@ TAO_ORBInitInfo::orb_id (void) } IOP::CodecFactory_ptr -TAO_ORBInitInfo::codec_factory (void) +TAO_ORBInitInfo::codec_factory () { if (CORBA::is_nil (this->codec_factory_.in ())) { @@ -277,7 +277,7 @@ TAO_ORBInitInfo::add_ior_interceptor_with_policy ( } PortableInterceptor::SlotId -TAO_ORBInitInfo::allocate_slot_id (void) +TAO_ORBInitInfo::allocate_slot_id () { this->check_validity (); @@ -333,7 +333,7 @@ TAO_ORBInitInfo::allocate_tss_slot_id (ACE_CLEANUP_FUNC cleanup) } void -TAO_ORBInitInfo::check_validity (void) +TAO_ORBInitInfo::check_validity () { if (this->orb_core_ == 0) { @@ -348,7 +348,7 @@ TAO_ORBInitInfo::check_validity (void) } CORBA::ORB_ptr -TAO_ORBInitInfo::_get_orb (void) +TAO_ORBInitInfo::_get_orb () { this->check_validity (); @@ -379,7 +379,7 @@ TAO_ORBInitInfo::_duplicate (TAO_ORBInitInfo_ptr obj) return obj; } -const char* TAO_ORBInitInfo::_interface_repository_id (void) const +const char* TAO_ORBInitInfo::_interface_repository_id () const { return "IDL:TAO_ORBInitInfo:1.0"; } diff --git a/TAO/tao/PI/ORBInitInfo.h b/TAO/tao/PI/ORBInitInfo.h index 4dc4efdca3f..a8b960f33d4 100644 --- a/TAO/tao/PI/ORBInitInfo.h +++ b/TAO/tao/PI/ORBInitInfo.h @@ -71,14 +71,14 @@ public: //@{ /// Return the argument vector for the ORB currently being /// initialized as a string sequence. - virtual CORBA::StringSeq * arguments (void); + virtual CORBA::StringSeq * arguments (); /// Return the ORBid for the ORB currently being initialized. - virtual char * orb_id (void); + virtual char * orb_id (); /// Return the CodecFactory for the ORB currently being /// initialized. - virtual IOP::CodecFactory_ptr codec_factory (void); + virtual IOP::CodecFactory_ptr codec_factory (); /// Register a mapping between a string and a corresponding object /// reference with the ORB being initialized. @@ -132,7 +132,7 @@ public: /// Reserve a slot in table found within the /// PortableInterceptor::Current object. - virtual PortableInterceptor::SlotId allocate_slot_id (void); + virtual PortableInterceptor::SlotId allocate_slot_id (); /// Register a policy factory of the given policy type with the ORB /// currently being initialized. @@ -140,7 +140,7 @@ public: CORBA::PolicyType type, PortableInterceptor::PolicyFactory_ptr policy_factory); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); //@} /** @@ -171,18 +171,18 @@ public: * * @note Only use this method if you know what you are doing. */ - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Invalidate this ORBInitInfo instance. /** * @note This method is only meant to be called by the * CORBA::ORB_init() function. */ - void invalidate (void); + void invalidate (); /// Return the number of allocated slots in for the PICurrent /// object. - PortableInterceptor::SlotId slot_count (void) const; + PortableInterceptor::SlotId slot_count () const; //@} /** @@ -202,24 +202,24 @@ public: static TAO_ORBInitInfo_ptr _unchecked_narrow (CORBA::Object_ptr obj); - static TAO_ORBInitInfo_ptr _nil (void) + static TAO_ORBInitInfo_ptr _nil () { return (TAO_ORBInitInfo_ptr)0; } //@} - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; protected: /// Destructor is protected to enforce proper memory management /// through the reference counting mechanism. - ~TAO_ORBInitInfo (void); + ~TAO_ORBInitInfo (); /// Check if this ORBInitInfo instance is valid. Once post_init() /// has been called on each of the ORBInitializers, this ORBInitInfo /// is no longer valid. Throw an exception in that case. - void check_validity (void); + void check_validity (); private: @@ -258,7 +258,7 @@ namespace TAO { static TAO_ORBInitInfo_ptr duplicate (TAO_ORBInitInfo_ptr); static void release (TAO_ORBInitInfo_ptr); - static TAO_ORBInitInfo_ptr nil (void); + static TAO_ORBInitInfo_ptr nil (); static CORBA::Boolean marshal (TAO_ORBInitInfo_ptr p, TAO_OutputCDR & cdr); }; } diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp index c74c4f5e385..f21bc49245c 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.cpp @@ -16,7 +16,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ORBInitializer_Registry::ORBInitializer_Registry (void) +TAO::ORBInitializer_Registry::ORBInitializer_Registry () : lock_ (), initializers_ () { @@ -66,7 +66,7 @@ TAO::ORBInitializer_Registry::init (int, ACE_TCHAR *[]) } int -TAO::ORBInitializer_Registry::fini (void) +TAO::ORBInitializer_Registry::fini () { ACE_GUARD_RETURN (TAO_SYNCH_RECURSIVE_MUTEX, guard, diff --git a/TAO/tao/PI/ORBInitializer_Registry_Impl.h b/TAO/tao/PI/ORBInitializer_Registry_Impl.h index f6c9de7cd2c..40156abfe85 100644 --- a/TAO/tao/PI/ORBInitializer_Registry_Impl.h +++ b/TAO/tao/PI/ORBInitializer_Registry_Impl.h @@ -43,7 +43,7 @@ namespace TAO : public ORBInitializer_Registry_Adapter { public: - ORBInitializer_Registry (void); + ORBInitializer_Registry (); /// Added to provide registration for the several static service /// objects, brought in with this ORBInitializer_Registry @@ -57,7 +57,7 @@ namespace TAO /// Service config fini method, release all ORBInitializers at this /// moment - virtual int fini (void); + virtual int fini (); /// Register an ORBInitializer with the underlying ORBInitializer /// array. @@ -81,8 +81,8 @@ namespace TAO private: // Prevent copying - ORBInitializer_Registry (const ORBInitializer_Registry &); - void operator= (const ORBInitializer_Registry &); + ORBInitializer_Registry (const ORBInitializer_Registry &) = delete; + void operator= (const ORBInitializer_Registry &) = delete; private: TAO_SYNCH_RECURSIVE_MUTEX lock_; diff --git a/TAO/tao/PI/PI.cpp b/TAO/tao/PI/PI.cpp index 4a8dde4d7a1..319c44c812a 100644 --- a/TAO/tao/PI/PI.cpp +++ b/TAO/tao/PI/PI.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL // This one is used during static initialization while the other is used // when PI is a shared library. int -TAO_PI_Init::Initializer (void) +TAO_PI_Init::Initializer () { #if TAO_HAS_INTERCEPTORS == 1 ACE_Service_Config::process_directive (ace_svc_desc_TAO_ClientRequestInterceptor_Adapter_Factory_Impl); diff --git a/TAO/tao/PI/PI.h b/TAO/tao/PI/PI.h index 2d0f9cbe662..addfd85df07 100644 --- a/TAO/tao/PI/PI.h +++ b/TAO/tao/PI/PI.h @@ -31,7 +31,7 @@ class TAO_PI_Export TAO_PI_Init public: /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; #if defined (TAO_AS_STATIC_LIBS) || (defined (ACE_VXWORKS) && !defined (__RTP__)) diff --git a/TAO/tao/PI/PICurrent.cpp b/TAO/tao/PI/PICurrent.cpp index 2a673e1eb3f..86bb1f2c632 100644 --- a/TAO/tao/PI/PICurrent.cpp +++ b/TAO/tao/PI/PICurrent.cpp @@ -20,10 +20,6 @@ TAO::PICurrent::PICurrent (TAO_ORB_Core &orb_core) { } -TAO::PICurrent::~PICurrent (void) -{ -} - CORBA::Any * TAO::PICurrent::get_slot (PortableInterceptor::SlotId identifier) { @@ -50,14 +46,14 @@ namespace } TAO::PICurrent_Impl * -TAO::PICurrent::tsc (void) +TAO::PICurrent::tsc () { TAO::PICurrent_Impl *impl = static_cast<TAO::PICurrent_Impl *> ( this->orb_core_.get_tss_resource (this->tss_slot_)); // If this TSS has not yet been set-up, give it it's own PICurrent_Impl. - if (0 == impl) + if (!impl) { ACE_NEW_THROW_EX (impl, TAO::PICurrent_Impl (&this->orb_core_, this->tss_slot_), @@ -89,7 +85,7 @@ TAO::PICurrent::check_validity (const PortableInterceptor::SlotId &identifier) } CORBA::ORB_ptr -TAO::PICurrent::_get_orb (void) +TAO::PICurrent::_get_orb () { return CORBA::ORB::_duplicate (this->orb_core_.orb ()); } diff --git a/TAO/tao/PI/PICurrent.h b/TAO/tao/PI/PICurrent.h index c5fb1391941..78ae7d699ec 100644 --- a/TAO/tao/PI/PICurrent.h +++ b/TAO/tao/PI/PICurrent.h @@ -76,14 +76,14 @@ namespace TAO const CORBA::Any & data); //@} - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /// Number of slots allocated in the slot table. - PortableInterceptor::SlotId slot_count (void) const; + PortableInterceptor::SlotId slot_count () const; /// Retrieve the PICurrent implementation from TSS, i.e. the thread /// scope current (TSC). - PICurrent_Impl * tsc (void); + PICurrent_Impl * tsc (); /// Verify the validity of the given SlotId. void check_validity (const PortableInterceptor::SlotId &identifier); @@ -98,14 +98,14 @@ namespace TAO * counted, and should not be destroyed using delete() by anything * other than the reference counting mechanism. */ - virtual ~PICurrent (void); + virtual ~PICurrent () = default; private: /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - PICurrent (const PICurrent &); - void operator= (const PICurrent &); + PICurrent (const PICurrent &) = delete; + void operator= (const PICurrent &) = delete; //@} private: diff --git a/TAO/tao/PI/PICurrent_Impl.cpp b/TAO/tao/PI/PICurrent_Impl.cpp index 3c3ae41dd95..9f8ccaba8f8 100644 --- a/TAO/tao/PI/PICurrent_Impl.cpp +++ b/TAO/tao/PI/PICurrent_Impl.cpp @@ -171,7 +171,7 @@ TAO::PICurrent_Impl::~PICurrent_Impl () } void -TAO::PICurrent_Impl::push (void) +TAO::PICurrent_Impl::push () { if (this->orb_core_) // We have a stack to adjust { @@ -197,7 +197,7 @@ TAO::PICurrent_Impl::push (void) } void -TAO::PICurrent_Impl::pop (void) +TAO::PICurrent_Impl::pop () { if (this->orb_core_) // We have a stack to adjust { diff --git a/TAO/tao/PI/PICurrent_Impl.h b/TAO/tao/PI/PICurrent_Impl.h index 3d22b82bb1e..7819fdda9cc 100644 --- a/TAO/tao/PI/PICurrent_Impl.h +++ b/TAO/tao/PI/PICurrent_Impl.h @@ -52,7 +52,7 @@ namespace TAO size_t tss_slot= 0, PICurrent_Impl *pop= 0); /// Destructor. - ~PICurrent_Impl (void); + ~PICurrent_Impl (); /// Retrieve information stored in the slot table at the given /// SlotId. @@ -66,10 +66,10 @@ namespace TAO void take_lazy_copy (PICurrent_Impl *p); /// Push a new PICurrent_Impl on stack - void push (void); + void push (); /// Pop old PICurrent_Impl from stack - void pop (void); + void pop (); private: /// Force this object to convert from a logical (referenced) @@ -97,8 +97,8 @@ namespace TAO /// Prevent copying through the copy constructor and the assignment /// operator. //@{ - PICurrent_Impl (const PICurrent_Impl &); - void operator= (const PICurrent_Impl &); + PICurrent_Impl (const PICurrent_Impl &) = delete; + void operator= (const PICurrent_Impl &) = delete; //@} private: diff --git a/TAO/tao/PI/PI_ORBInitializer.cpp b/TAO/tao/PI/PI_ORBInitializer.cpp index 5aa02eea3a9..123d4f54ea8 100644 --- a/TAO/tao/PI/PI_ORBInitializer.cpp +++ b/TAO/tao/PI/PI_ORBInitializer.cpp @@ -16,7 +16,6 @@ TAO_PI_ORBInitializer::pre_init (PortableInterceptor::ORBInitInfo_ptr) { } - void TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) { @@ -39,7 +38,6 @@ TAO_PI_ORBInitializer::post_init (PortableInterceptor::ORBInitInfo_ptr info) this->register_policy_factories (info); } - void TAO_PI_ORBInitializer::register_policy_factories ( PortableInterceptor::ORBInitInfo_ptr info) diff --git a/TAO/tao/PI/PI_ORBInitializer.h b/TAO/tao/PI/PI_ORBInitializer.h index 082f9a3fdc5..8a7af55048d 100644 --- a/TAO/tao/PI/PI_ORBInitializer.h +++ b/TAO/tao/PI/PI_ORBInitializer.h @@ -37,7 +37,6 @@ class TAO_PI_Export TAO_PI_ORBInitializer public virtual ::CORBA::LocalObject { public: - /** * @name PortableInterceptor::ORBInitializer methods * @@ -51,7 +50,6 @@ public: //@} private: - /// Register PortableInterceptor policy factories. void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); diff --git a/TAO/tao/PI/PI_PolicyFactory.h b/TAO/tao/PI/PI_PolicyFactory.h index fac7f3071af..85236c1f2cf 100644 --- a/TAO/tao/PI/PI_PolicyFactory.h +++ b/TAO/tao/PI/PI_PolicyFactory.h @@ -34,8 +34,7 @@ class TAO_PI_Export TAO_PI_PolicyFactory public virtual ::CORBA::LocalObject { public: - CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value); + CORBA::Policy_ptr create_policy (CORBA::PolicyType type, const CORBA::Any & value); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/PolicyFactoryC.cpp b/TAO/tao/PI/PolicyFactoryC.cpp index cf36dafbbb1..eb614ce9dbb 100644 --- a/TAO/tao/PI/PolicyFactoryC.cpp +++ b/TAO/tao/PI/PolicyFactoryC.cpp @@ -63,7 +63,7 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::release ( } PortableInterceptor::PolicyFactory_ptr -TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil (void) +TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::nil () { return PortableInterceptor::PolicyFactory::_nil (); } @@ -77,10 +77,10 @@ TAO::Objref_Traits<PortableInterceptor::PolicyFactory>::marshal ( return ::CORBA::Object::marshal (p, cdr); } -PortableInterceptor::PolicyFactory::PolicyFactory (void) +PortableInterceptor::PolicyFactory::PolicyFactory () {} -PortableInterceptor::PolicyFactory::~PolicyFactory (void) +PortableInterceptor::PolicyFactory::~PolicyFactory () {} PortableInterceptor::PolicyFactory_ptr @@ -146,7 +146,7 @@ PortableInterceptor::PolicyFactory::_is_a (const char *value) } } -const char* PortableInterceptor::PolicyFactory::_interface_repository_id (void) const +const char* PortableInterceptor::PolicyFactory::_interface_repository_id () const { return "IDL:omg.org/PortableInterceptor/PolicyFactory:1.0"; } diff --git a/TAO/tao/PI/PolicyFactoryC.h b/TAO/tao/PI/PolicyFactoryC.h index 0b2dfabc75b..f97f52df981 100644 --- a/TAO/tao/PI/PolicyFactoryC.h +++ b/TAO/tao/PI/PolicyFactoryC.h @@ -106,7 +106,7 @@ namespace PortableInterceptor ); - static PolicyFactory_ptr _nil (void) + static PolicyFactory_ptr _nil () { return static_cast<PolicyFactory_ptr> (0); } @@ -137,14 +137,14 @@ namespace PortableInterceptor ); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. - PolicyFactory (void); + PolicyFactory (); - virtual ~PolicyFactory (void); + virtual ~PolicyFactory (); private: // Private and unimplemented for concrete interfaces. @@ -179,7 +179,7 @@ namespace TAO static void release ( ::PortableInterceptor::PolicyFactory_ptr ); - static ::PortableInterceptor::PolicyFactory_ptr nil (void); + static ::PortableInterceptor::PolicyFactory_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::PolicyFactory_ptr p, TAO_OutputCDR & cdr diff --git a/TAO/tao/PI/PolicyFactory_Loader.cpp b/TAO/tao/PI/PolicyFactory_Loader.cpp index 81cd0387879..252e0f9f1cf 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.cpp +++ b/TAO/tao/PI/PolicyFactory_Loader.cpp @@ -17,7 +17,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::PolicyFactory_Registry_Adapter* -TAO_PolicyFactory_Loader::create (void) +TAO_PolicyFactory_Loader::create () { TAO::PolicyFactory_Registry_Adapter* obj = 0; ACE_NEW_RETURN (obj, @@ -27,7 +27,7 @@ TAO_PolicyFactory_Loader::create (void) } int -TAO_PolicyFactory_Loader::Initializer (void) +TAO_PolicyFactory_Loader::Initializer () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_PolicyFactory_Loader); } diff --git a/TAO/tao/PI/PolicyFactory_Loader.h b/TAO/tao/PI/PolicyFactory_Loader.h index d96c7d39abd..98ad244420f 100644 --- a/TAO/tao/PI/PolicyFactory_Loader.h +++ b/TAO/tao/PI/PolicyFactory_Loader.h @@ -31,10 +31,10 @@ class TAO_PI_Export TAO_PolicyFactory_Loader { public: /// Creates a Codec factory and returns it. - virtual TAO::PolicyFactory_Registry_Adapter* create (void); + virtual TAO::PolicyFactory_Registry_Adapter* create (); /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/PI/PolicyFactory_Registry.cpp b/TAO/tao/PI/PolicyFactory_Registry.cpp index 0ff905feef5..fc8d396aece 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.cpp +++ b/TAO/tao/PI/PolicyFactory_Registry.cpp @@ -6,12 +6,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry (void) +TAO_PolicyFactory_Registry::TAO_PolicyFactory_Registry () : factories_ (TAO_DEFAULT_POLICY_FACTORY_REGISTRY_SIZE) { } -TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry (void) +TAO_PolicyFactory_Registry::~TAO_PolicyFactory_Registry () { const TABLE::iterator end (this->factories_.end ()); diff --git a/TAO/tao/PI/PolicyFactory_Registry.h b/TAO/tao/PI/PolicyFactory_Registry.h index ddd26b87151..9ea5fb17330 100644 --- a/TAO/tao/PI/PolicyFactory_Registry.h +++ b/TAO/tao/PI/PolicyFactory_Registry.h @@ -39,7 +39,6 @@ class TAO_PolicyFactory_Registry : public TAO::PolicyFactory_Registry_Adapter { public: - /** * The type of table that maps policy type to policy factory. * @@ -51,16 +50,14 @@ public: */ typedef ACE_Map_Manager<CORBA::PolicyType, PortableInterceptor::PolicyFactory_ptr, - ACE_Null_Mutex> - TABLE; + ACE_Null_Mutex> TABLE; public: - /// Constructor - TAO_PolicyFactory_Registry (void); + TAO_PolicyFactory_Registry (); /// Destructor. Releases duplicated PolicyFactory references. - ~TAO_PolicyFactory_Registry (void); + ~TAO_PolicyFactory_Registry (); /// Register a PolicyFactory with the underlying PolicyFactory /// sequence. This method should only be called during ORB @@ -83,10 +80,8 @@ public: bool factory_exists (CORBA::PolicyType & type) const; private: - /// The table that maps policy type to policy factory. TABLE factories_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PI/ProcessingModePolicy.cpp b/TAO/tao/PI/ProcessingModePolicy.cpp index 046e5014ac4..85938fec13d 100644 --- a/TAO/tao/PI/ProcessingModePolicy.cpp +++ b/TAO/tao/PI/ProcessingModePolicy.cpp @@ -17,9 +17,9 @@ TAO_ProcessingModePolicy::TAO_ProcessingModePolicy } CORBA::Policy_ptr -TAO_ProcessingModePolicy::copy (void) +TAO_ProcessingModePolicy::copy () { - TAO_ProcessingModePolicy *copy = 0; + TAO_ProcessingModePolicy *copy {}; ACE_NEW_THROW_EX (copy, TAO_ProcessingModePolicy (this->processing_mode_), CORBA::NO_MEMORY ()); @@ -28,18 +28,18 @@ TAO_ProcessingModePolicy::copy (void) } void -TAO_ProcessingModePolicy::destroy (void) +TAO_ProcessingModePolicy::destroy () { } PortableInterceptor::ProcessingMode -TAO_ProcessingModePolicy::processing_mode (void) +TAO_ProcessingModePolicy::processing_mode () { return processing_mode_; } CORBA::PolicyType -TAO_ProcessingModePolicy::policy_type (void) +TAO_ProcessingModePolicy::policy_type () { return PortableInterceptor::PROCESSING_MODE_POLICY_TYPE; } diff --git a/TAO/tao/PI/ProcessingModePolicy.h b/TAO/tao/PI/ProcessingModePolicy.h index ce6d12690db..ecc270c8e3d 100644 --- a/TAO/tao/PI/ProcessingModePolicy.h +++ b/TAO/tao/PI/ProcessingModePolicy.h @@ -44,13 +44,13 @@ public: /// Constructor. TAO_ProcessingModePolicy (PortableInterceptor::ProcessingMode mode); - virtual PortableInterceptor::ProcessingMode processing_mode (void); + virtual PortableInterceptor::ProcessingMode processing_mode (); - virtual CORBA::PolicyType policy_type (void); + virtual CORBA::PolicyType policy_type (); - virtual CORBA::Policy_ptr copy (void); + virtual CORBA::Policy_ptr copy (); - virtual void destroy (void); + virtual void destroy (); private: /// The attribute diff --git a/TAO/tao/PI/RequestInfo_Util.cpp b/TAO/tao/PI/RequestInfo_Util.cpp index 29ec2f53511..adb2c7c0597 100644 --- a/TAO/tao/PI/RequestInfo_Util.cpp +++ b/TAO/tao/PI/RequestInfo_Util.cpp @@ -13,7 +13,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL Dynamic::ParameterList * -TAO_RequestInfo_Util::make_parameter_list (void) +TAO_RequestInfo_Util::make_parameter_list () { Dynamic::ParameterList *parameter_list = 0; ACE_NEW_THROW_EX (parameter_list, @@ -30,7 +30,7 @@ TAO_RequestInfo_Util::make_parameter_list (void) } Dynamic::ExceptionList * -TAO_RequestInfo_Util::make_exception_list (void) +TAO_RequestInfo_Util::make_exception_list () { Dynamic::ExceptionList *exception_list = 0; ACE_NEW_THROW_EX (exception_list, @@ -47,7 +47,7 @@ TAO_RequestInfo_Util::make_exception_list (void) } Dynamic::ContextList * -TAO_RequestInfo_Util::make_context_list (void) +TAO_RequestInfo_Util::make_context_list () { Dynamic::ContextList *context_list = 0; ACE_NEW_THROW_EX (context_list, @@ -64,7 +64,7 @@ TAO_RequestInfo_Util::make_context_list (void) } Dynamic::RequestContext * -TAO_RequestInfo_Util::make_request_context (void) +TAO_RequestInfo_Util::make_request_context () { Dynamic::RequestContext *request_context = 0; ACE_NEW_THROW_EX (request_context, diff --git a/TAO/tao/PI/RequestInfo_Util.h b/TAO/tao/PI/RequestInfo_Util.h index b0c48d878bf..56537358735 100644 --- a/TAO/tao/PI/RequestInfo_Util.h +++ b/TAO/tao/PI/RequestInfo_Util.h @@ -60,13 +60,13 @@ public: * class. */ //@{ - static Dynamic::ParameterList * make_parameter_list (void); + static Dynamic::ParameterList * make_parameter_list (); - static Dynamic::ExceptionList * make_exception_list (void); + static Dynamic::ExceptionList * make_exception_list (); - static Dynamic::ContextList * make_context_list (void); + static Dynamic::ContextList * make_context_list (); - static Dynamic::RequestContext * make_request_context (void); + static Dynamic::RequestContext * make_request_context (); static CORBA::Any * make_any (CORBA::Boolean tk_void_any); //@} diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp index ce14ce596b4..b9c074cd79e 100644 --- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp +++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl (void) +TAO_RequestInterceptor_Adapter_Impl::~TAO_RequestInterceptor_Adapter_Impl () { } diff --git a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h index a3ff67558ef..44d76c58261 100644 --- a/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h +++ b/TAO/tao/PI/RequestInterceptor_Adapter_Impl.h @@ -43,7 +43,7 @@ class TAO_PI_Export TAO_RequestInterceptor_Adapter_Impl : public TAO::RequestInterceptor_Adapter { public: - ~TAO_RequestInterceptor_Adapter_Impl (void); + ~TAO_RequestInterceptor_Adapter_Impl (); void popTSC (TAO_ORB_Core *orb_core); void pushTSC (TAO_ORB_Core *orb_core); diff --git a/TAO/tao/PI_Server/PICurrent_Guard.cpp b/TAO/tao/PI_Server/PICurrent_Guard.cpp index 87500e8ff82..61f12fffadf 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.cpp +++ b/TAO/tao/PI_Server/PICurrent_Guard.cpp @@ -53,7 +53,7 @@ TAO::PICurrent_Guard::PICurrent_Guard (TAO_ServerRequest &server_request, } } -TAO::PICurrent_Guard::~PICurrent_Guard (void) +TAO::PICurrent_Guard::~PICurrent_Guard () { if (this->src_ != 0 && this->dest_ != 0 && this->src_ != this->dest_) diff --git a/TAO/tao/PI_Server/PICurrent_Guard.h b/TAO/tao/PI_Server/PICurrent_Guard.h index 8eaee4ec81d..16014c78dca 100644 --- a/TAO/tao/PI_Server/PICurrent_Guard.h +++ b/TAO/tao/PI_Server/PICurrent_Guard.h @@ -72,7 +72,7 @@ namespace TAO * points are invoked, and after the starting and intermediate (if * any) interception points are invoked. */ - ~PICurrent_Guard (void); + ~PICurrent_Guard (); private: diff --git a/TAO/tao/PI_Server/PI_Server.cpp b/TAO/tao/PI_Server/PI_Server.cpp index 0c222f5d26b..322d9be2505 100644 --- a/TAO/tao/PI_Server/PI_Server.cpp +++ b/TAO/tao/PI_Server/PI_Server.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_PI_Server_Init::Initializer (void) +TAO_PI_Server_Init::Initializer () { #if TAO_HAS_INTERCEPTORS == 1 ACE_Service_Config::process_directive (ace_svc_desc_TAO_ServerRequestInterceptor_Adapter_Factory_Impl); diff --git a/TAO/tao/PI_Server/PI_Server.h b/TAO/tao/PI_Server/PI_Server.h index 63b7f2b2281..f38922a5209 100644 --- a/TAO/tao/PI_Server/PI_Server.h +++ b/TAO/tao/PI_Server/PI_Server.h @@ -31,7 +31,7 @@ class TAO_PI_Server_Export TAO_PI_Server_Init public: /// Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static int diff --git a/TAO/tao/PI_Server/PI_Server_Loader.cpp b/TAO/tao/PI_Server/PI_Server_Loader.cpp index 6971657efc8..3c38f5cf1fd 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.cpp +++ b/TAO/tao/PI_Server/PI_Server_Loader.cpp @@ -8,12 +8,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_PI_Server_Loader::TAO_PI_Server_Loader (void) +TAO_PI_Server_Loader::TAO_PI_Server_Loader () : initialized_ (false) { } -TAO_PI_Server_Loader::~TAO_PI_Server_Loader (void) +TAO_PI_Server_Loader::~TAO_PI_Server_Loader () { } diff --git a/TAO/tao/PI_Server/PI_Server_Loader.h b/TAO/tao/PI_Server/PI_Server_Loader.h index b7079eb7c0d..d466c9a2564 100644 --- a/TAO/tao/PI_Server/PI_Server_Loader.h +++ b/TAO/tao/PI_Server/PI_Server_Loader.h @@ -27,10 +27,10 @@ class TAO_PI_Server_Export TAO_PI_Server_Loader : public ACE_Service_Object { public: /// Constructor. - TAO_PI_Server_Loader (void); + TAO_PI_Server_Loader (); /// Destructor. - virtual ~TAO_PI_Server_Loader (void); + virtual ~TAO_PI_Server_Loader (); /// Initialize the PI_Server loader hooks. virtual int init (int argc, ACE_TCHAR* []); diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp index b2863450ee9..93470b44b2d 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.cpp @@ -15,7 +15,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl (void) +TAO::ServerRequestInterceptor_Adapter_Impl::ServerRequestInterceptor_Adapter_Impl () { } @@ -506,13 +506,13 @@ TAO::ServerRequestInterceptor_Adapter_Impl::add_interceptor ( } void -TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors (void) +TAO::ServerRequestInterceptor_Adapter_Impl::destroy_interceptors () { this->interceptor_list_.destroy_interceptors (); } TAO::PICurrent_Impl * -TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current (void) +TAO::ServerRequestInterceptor_Adapter_Impl::allocate_pi_current () { TAO::PICurrent_Impl *pi = 0; ACE_NEW_RETURN (pi, diff --git a/TAO/tao/PI_Server/ServerInterceptorAdapter.h b/TAO/tao/PI_Server/ServerInterceptorAdapter.h index 6a5b7f25d12..15630621c6a 100644 --- a/TAO/tao/PI_Server/ServerInterceptorAdapter.h +++ b/TAO/tao/PI_Server/ServerInterceptorAdapter.h @@ -68,7 +68,7 @@ namespace TAO { public: /// Constructor. - ServerRequestInterceptor_Adapter_Impl (void); + ServerRequestInterceptor_Adapter_Impl (); /** * @name PortableInterceptor Server Side Interception Points @@ -154,9 +154,9 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies); - virtual void destroy_interceptors (void); + virtual void destroy_interceptors (); - virtual TAO::PICurrent_Impl *allocate_pi_current (void); + virtual TAO::PICurrent_Impl *allocate_pi_current (); virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent); diff --git a/TAO/tao/PI_Server/ServerRequestDetails.h b/TAO/tao/PI_Server/ServerRequestDetails.h index 1727d249013..69ea625353f 100644 --- a/TAO/tao/PI_Server/ServerRequestDetails.h +++ b/TAO/tao/PI_Server/ServerRequestDetails.h @@ -49,7 +49,7 @@ namespace TAO class ServerRequestDetails { public: - ServerRequestDetails (void); + ServerRequestDetails (); void apply_policies (const CORBA::PolicyList& policies); diff --git a/TAO/tao/PI_Server/ServerRequestInfo.cpp b/TAO/tao/PI_Server/ServerRequestInfo.cpp index 93d297ca0c4..418c92be0b1 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.cpp +++ b/TAO/tao/PI_Server/ServerRequestInfo.cpp @@ -27,7 +27,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::ULong -TAO::ServerRequestInfo::request_id (void) +TAO::ServerRequestInfo::request_id () { // The request ID returned by this method need not correspond to the // GIOP request ID sent with the client request. The request ID @@ -65,15 +65,15 @@ TAO::ServerRequestInfo::request_id (void) } char * -TAO::ServerRequestInfo::operation (void) +TAO::ServerRequestInfo::operation () { return CORBA::string_dup (this->server_request_.operation ()); } Dynamic::ParameterList * -TAO::ServerRequestInfo::arguments (void) +TAO::ServerRequestInfo::arguments () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -115,9 +115,9 @@ TAO::ServerRequestInfo::arguments (void) } Dynamic::ExceptionList * -TAO::ServerRequestInfo::exceptions (void) +TAO::ServerRequestInfo::exceptions () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -145,21 +145,21 @@ TAO::ServerRequestInfo::exceptions (void) } Dynamic::ContextList * -TAO::ServerRequestInfo::contexts (void) +TAO::ServerRequestInfo::contexts () { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } Dynamic::RequestContext * -TAO::ServerRequestInfo::operation_context (void) +TAO::ServerRequestInfo::operation_context () { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } CORBA::Any * -TAO::ServerRequestInfo::result (void) +TAO::ServerRequestInfo::result () { - if (this->args_ == 0) + if (!this->args_) { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } @@ -167,8 +167,7 @@ TAO::ServerRequestInfo::result (void) // Generate the result on demand. static CORBA::Boolean const tk_void_any = true; - CORBA::Any * result_any = - TAO_RequestInfo_Util::make_any (tk_void_any); + CORBA::Any * result_any = TAO_RequestInfo_Util::make_any (tk_void_any); CORBA::Any_var safe_result_any = result_any; @@ -181,35 +180,41 @@ TAO::ServerRequestInfo::result (void) } CORBA::Boolean -TAO::ServerRequestInfo::response_expected (void) +TAO::ServerRequestInfo::response_expected () { return this->server_request_.response_expected (); } Messaging::SyncScope -TAO::ServerRequestInfo::sync_scope (void) +TAO::ServerRequestInfo::sync_scope () { if (this->server_request_.sync_with_server ()) + { return Messaging::SYNC_WITH_SERVER; + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::ReplyStatus -TAO::ServerRequestInfo::reply_status (void) +TAO::ServerRequestInfo::reply_status () { if (this->server_request_.pi_reply_status () == -1) + { // A reply hasn't been received yet. throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } return this->server_request_.pi_reply_status (); } CORBA::Object_ptr -TAO::ServerRequestInfo::forward_reference (void) +TAO::ServerRequestInfo::forward_reference () { if (this->server_request_.pi_reply_status () != PortableInterceptor::LOCATION_FORWARD) + { throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } // TAO_ServerRequest::forward_location() already duplicates the // object reference. There is no need to duplicate it here. @@ -227,7 +232,7 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id) TAO::PICurrent *pi_current = dynamic_cast <TAO::PICurrent*> (pi_current_obj); - if (pi_current == 0) + if (!pi_current) throw ::CORBA::INTERNAL (); pi_current->check_validity (id); @@ -236,7 +241,6 @@ TAO::ServerRequestInfo::get_slot (PortableInterceptor::SlotId id) TAO::PICurrent_Impl *rsc = this->server_request_.rs_pi_current (); return rsc->get_slot (id); - } IOP::ServiceContext * @@ -280,7 +284,7 @@ TAO::ServerRequestInfo::get_service_context_i ( // exception from an Any. This method is in place just to be compliant // with the spec. CORBA::Any * -TAO::ServerRequestInfo::sending_exception (void) +TAO::ServerRequestInfo::sending_exception () { if (this->server_request_.pi_reply_status () != PortableInterceptor::SYSTEM_EXCEPTION && this->server_request_.pi_reply_status () != PortableInterceptor::USER_EXCEPTION) @@ -291,8 +295,7 @@ TAO::ServerRequestInfo::sending_exception (void) // The spec says that if it is a user exception which cannot be // inserted then the UNKNOWN exception should be thrown with minor // code 1. - - CORBA::Any * temp = 0; + CORBA::Any * temp {}; ACE_NEW_THROW_EX (temp, CORBA::Any, @@ -304,56 +307,61 @@ TAO::ServerRequestInfo::sending_exception (void) CORBA::Any_var caught_exception_var = temp; - if (this->server_request_.caught_exception () != 0) + if (this->server_request_.caught_exception ()) + { (*temp) <<= *(this->server_request_.caught_exception ()); + } return caught_exception_var._retn (); } char * -TAO::ServerRequestInfo::server_id (void) +TAO::ServerRequestInfo::server_id () { - if (this->servant_upcall_ != 0) - return - CORBA::string_dup (this->server_request_.orb_core ()->server_id ()); + if (this->servant_upcall_) + { + return CORBA::string_dup (this->server_request_.orb_core ()->server_id ()); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } char * -TAO::ServerRequestInfo::orb_id (void) +TAO::ServerRequestInfo::orb_id () { - if (this->servant_upcall_ != 0) - return - CORBA::string_dup (this->server_request_.orb_core ()->orbid ()); + if (this->servant_upcall_) + { + return CORBA::string_dup (this->server_request_.orb_core ()->orbid ()); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::AdapterName * -TAO::ServerRequestInfo::adapter_name (void) +TAO::ServerRequestInfo::adapter_name () { // The adapter_name attribute defines a name for the object adapter // that services requests for the invoked object. In the case of the // POA, the adapter_name is the sequence of names from the root POA // to the POA that services the request. The root POA is not named // in this sequence. - if (this->servant_upcall_ != 0) - return - this->servant_upcall_->poa ().adapter_name (); + if (this->servant_upcall_) + { + return this->servant_upcall_->poa ().adapter_name (); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } PortableInterceptor::ObjectId * -TAO::ServerRequestInfo::object_id (void) +TAO::ServerRequestInfo::object_id () { if (this->servant_upcall_ != 0) { const PortableServer::ObjectId &id = this->servant_upcall_->user_id (); - PortableInterceptor::ObjectId *tmp = 0; + PortableInterceptor::ObjectId *tmp {}; ACE_NEW_THROW_EX (tmp, PortableInterceptor::ObjectId, @@ -385,21 +393,25 @@ TAO::ServerRequestInfo::object_id (void) } CORBA::OctetSeq * -TAO::ServerRequestInfo::adapter_id (void) +TAO::ServerRequestInfo::adapter_id () { - if (this->servant_upcall_ != 0) + if (this->servant_upcall_) + { return this->servant_upcall_->poa ().id (); + } throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); } char * -TAO::ServerRequestInfo::target_most_derived_interface (void) +TAO::ServerRequestInfo::target_most_derived_interface () { - PortableServer::Servant const servant = - (this->servant_upcall_ == 0 - ? 0 - : this->servant_upcall_->servant ()); + if (this->servant_upcall_ == 0) + { + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } + + PortableServer::Servant const servant = this->servant_upcall_->servant (); if (servant == 0) { @@ -446,7 +458,7 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, TAO::PICurrent *pi_current = dynamic_cast <TAO::PICurrent*> (pi_current_obj); - if (pi_current == 0) + if (!pi_current) throw ::CORBA::INTERNAL (); pi_current->check_validity (id); @@ -460,11 +472,13 @@ TAO::ServerRequestInfo::set_slot (PortableInterceptor::SlotId id, CORBA::Boolean TAO::ServerRequestInfo::target_is_a (const char * id) { + if (this->servant_upcall_ == 0) + { + throw ::CORBA::BAD_INV_ORDER (CORBA::OMGVMCID | 14, CORBA::COMPLETED_NO); + } + // Implemented in the generated skeleton. - PortableServer::Servant const servant = - (this->servant_upcall_ == 0 - ? 0 - : this->servant_upcall_->servant ()); + PortableServer::Servant const servant = this->servant_upcall_->servant (); if (servant == 0) { diff --git a/TAO/tao/PI_Server/ServerRequestInfo.h b/TAO/tao/PI_Server/ServerRequestInfo.h index 98b1267f71a..279a231b79c 100644 --- a/TAO/tao/PI_Server/ServerRequestInfo.h +++ b/TAO/tao/PI_Server/ServerRequestInfo.h @@ -80,34 +80,34 @@ namespace TAO /// Return an ID unique to the current request. This request ID may /// or may not be the same as the GIOP request ID. - virtual CORBA::ULong request_id (void); + virtual CORBA::ULong request_id (); /// Return the operation name for the current request. - virtual char * operation (void); + virtual char * operation (); /// Return the list of arguments passed to the current operation. - virtual Dynamic::ParameterList * arguments (void); + virtual Dynamic::ParameterList * arguments (); /// Return the list of exceptions the current operation is capable /// of throwing. - virtual Dynamic::ExceptionList * exceptions (void); + virtual Dynamic::ExceptionList * exceptions (); - virtual Dynamic::ContextList * contexts (void); + virtual Dynamic::ContextList * contexts (); - virtual Dynamic::RequestContext * operation_context (void); + virtual Dynamic::RequestContext * operation_context (); /// Return the result of the current request. If there is no /// return value then an @c Any with @c tk_void @c TypeCode is /// returned. This method is not valid for oneway operations. - virtual CORBA::Any * result (void); + virtual CORBA::Any * result (); /// Returns @c true for a two-way operation, and @c false otherwise. - virtual CORBA::Boolean response_expected (void); + virtual CORBA::Boolean response_expected (); /// Return the @c sync_scope policy value for the current one-way /// operation. If the operation is not a one-way, a /// @c CORBA::BAD_INV_ORDER exception is thrown. - virtual Messaging::SyncScope sync_scope (void); + virtual Messaging::SyncScope sync_scope (); /// Return the reply status for the current request. /** @@ -115,12 +115,12 @@ namespace TAO * @c SYSTEM_EXCEPTION, @c USER_EXCEPTION, @c LOCATION_FORWARD, * @c TRANSPORT_RETRY, @c UNKNOWN.. */ - virtual PortableInterceptor::ReplyStatus reply_status (void); + virtual PortableInterceptor::ReplyStatus reply_status (); /// If the reply status is /// @c PortableInterceptor::LOCATION_FORWARD return the /// object reference to which the request was forwarded. - virtual CORBA::Object_ptr forward_reference (void); + virtual CORBA::Object_ptr forward_reference (); /// Retrieve data from the "request scope" @c PICurrent object. virtual CORBA::Any * get_slot (PortableInterceptor::SlotId id); @@ -141,29 +141,29 @@ namespace TAO * @note There is no trivial way to extract the exception from an * @c Any. */ - virtual CORBA::Any * sending_exception (void); + virtual CORBA::Any * sending_exception (); /// Return the @c ObjectId for the target object. - virtual PortableInterceptor::ObjectId * object_id (void); + virtual PortableInterceptor::ObjectId * object_id (); /// Return the @c AdapterId for the POA handling the current /// request. - virtual CORBA::OctetSeq * adapter_id (void); + virtual CORBA::OctetSeq * adapter_id (); /// Return the server_id of the server. The value is passed to /// the ORB via @c -ORBServerId parameter. - virtual char * server_id (void); + virtual char * server_id (); /// Return the ORBId value that is passed to the @c ORB_init /// call. - virtual char * orb_id (void); + virtual char * orb_id (); /// Return the name of the object adapter that services requests /// for the invoked object. - virtual PortableInterceptor::AdapterName * adapter_name (void); + virtual PortableInterceptor::AdapterName * adapter_name (); /// Return the most derived interface of the target object. - virtual char * target_most_derived_interface (void); + virtual char * target_most_derived_interface (); /// Return the policy of the given type in effect for the current /// request. @@ -207,7 +207,7 @@ namespace TAO /// Return a reference to the underlying @c TAO_ServerRequest /// object. - TAO_ServerRequest &server_request (void); + TAO_ServerRequest &server_request (); protected: /// Helper method to get the request and response service diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp index 30d7fe51d1a..80f6f6100b5 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.cpp @@ -64,7 +64,7 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::release ( } PortableInterceptor::ServerRequestInterceptor_ptr -TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil (void) +TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::nil () { return PortableInterceptor::ServerRequestInterceptor::_nil (); } @@ -78,10 +78,10 @@ TAO::Objref_Traits<PortableInterceptor::ServerRequestInterceptor>::marshal ( return ::CORBA::Object::marshal (p, cdr); } -PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor (void) +PortableInterceptor::ServerRequestInterceptor::ServerRequestInterceptor () {} -PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor (void) +PortableInterceptor::ServerRequestInterceptor::~ServerRequestInterceptor () {} PortableInterceptor::ServerRequestInterceptor_ptr @@ -156,7 +156,7 @@ PortableInterceptor::ServerRequestInterceptor::_is_a ( } } -const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id (void) const +const char* PortableInterceptor::ServerRequestInterceptor::_interface_repository_id () const { return "IDL:omg.org/PortableInterceptor/ServerRequestInterceptor:1.0"; } diff --git a/TAO/tao/PI_Server/ServerRequestInterceptorC.h b/TAO/tao/PI_Server/ServerRequestInterceptorC.h index 676567e42ef..4dce9d6cc6a 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptorC.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptorC.h @@ -131,7 +131,7 @@ namespace PortableInterceptor ); - static ServerRequestInterceptor_ptr _nil (void) + static ServerRequestInterceptor_ptr _nil () { return static_cast<ServerRequestInterceptor_ptr> (0); } @@ -203,14 +203,14 @@ namespace PortableInterceptor ); - virtual const char* _interface_repository_id (void) const; + virtual const char* _interface_repository_id () const; virtual ::CORBA::Boolean marshal (TAO_OutputCDR &cdr); protected: // Abstract or local interface only. - ServerRequestInterceptor (void); + ServerRequestInterceptor (); - virtual ~ServerRequestInterceptor (void); + virtual ~ServerRequestInterceptor (); private: // Private and unimplemented for concrete interfaces. @@ -245,7 +245,7 @@ namespace TAO static void release ( ::PortableInterceptor::ServerRequestInfo_ptr ); - static ::PortableInterceptor::ServerRequestInfo_ptr nil (void); + static ::PortableInterceptor::ServerRequestInfo_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInfo_ptr p, TAO_OutputCDR & cdr @@ -266,7 +266,7 @@ namespace TAO static void release ( ::PortableInterceptor::ServerRequestInterceptor_ptr ); - static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (void); + static ::PortableInterceptor::ServerRequestInterceptor_ptr nil (); static ::CORBA::Boolean marshal ( ::PortableInterceptor::ServerRequestInterceptor_ptr p, TAO_OutputCDR & cdr diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp index f04d2565187..c4123f9b325 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.cpp @@ -20,7 +20,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL TAO::ServerRequestInterceptor_Adapter* -TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create (void) +TAO_ServerRequestInterceptor_Adapter_Factory_Impl::create () { TAO::ServerRequestInterceptor_Adapter_Impl* obj = 0; ACE_NEW_RETURN (obj, diff --git a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h index 7c7abdab60b..9cacd9b0172 100644 --- a/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h +++ b/TAO/tao/PI_Server/ServerRequestInterceptor_Factory_Impl.h @@ -38,7 +38,7 @@ class TAO_PI_Server_Export TAO_ServerRequestInterceptor_Adapter_Factory_Impl : public TAO_ServerRequestInterceptor_Adapter_Factory { public: - virtual TAO::ServerRequestInterceptor_Adapter *create (void); + virtual TAO::ServerRequestInterceptor_Adapter *create (); }; diff --git a/TAO/tao/Parser_Registry.h b/TAO/tao/Parser_Registry.h index daacd764291..91c355f9bf0 100644 --- a/TAO/tao/Parser_Registry.h +++ b/TAO/tao/Parser_Registry.h @@ -45,10 +45,10 @@ class TAO_Export TAO_Parser_Registry { public: /// Default constructor. - TAO_Parser_Registry (void); + TAO_Parser_Registry (); /// Dstructor. - ~TAO_Parser_Registry (void); + ~TAO_Parser_Registry (); /// Initialize the parser registry with the list of known protocols. /// Invoked by the ORB during startup. @@ -60,8 +60,8 @@ public: // = Iterator. typedef TAO_IOR_Parser** Parser_Iterator; - Parser_Iterator begin (void) const; - Parser_Iterator end (void) const; + Parser_Iterator begin () const; + Parser_Iterator end () const; private: diff --git a/TAO/tao/Pluggable_Messaging_Utils.h b/TAO/tao/Pluggable_Messaging_Utils.h index 484ccbd5925..6cab6a91408 100644 --- a/TAO/tao/Pluggable_Messaging_Utils.h +++ b/TAO/tao/Pluggable_Messaging_Utils.h @@ -41,7 +41,7 @@ class TAO_Export TAO_Pluggable_Reply_Params_Base { public: /// Constructor. - TAO_Pluggable_Reply_Params_Base (void); + TAO_Pluggable_Reply_Params_Base (); /// The IOP service context list. IOP::ServiceContextList svc_ctx_; @@ -66,17 +66,17 @@ public: * a service context list and would like to pass on their contents * without a copy. */ - IOP::ServiceContextList &service_context_notowned (void); + IOP::ServiceContextList &service_context_notowned (); void service_context_notowned (IOP::ServiceContextList *svc); /// A flag that indicates if there is any data is going to get /// marshalled in the reply CORBA::Boolean argument_flag_; - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; void reply_status (GIOP::ReplyStatusType status); - GIOP::LocateStatusType locate_reply_status (void) const; + GIOP::LocateStatusType locate_reply_status () const; void locate_reply_status (GIOP::LocateStatusType status); protected: diff --git a/TAO/tao/PolicyFactory_Registry_Adapter.h b/TAO/tao/PolicyFactory_Registry_Adapter.h index 275a419cbc2..e359b804871 100644 --- a/TAO/tao/PolicyFactory_Registry_Adapter.h +++ b/TAO/tao/PolicyFactory_Registry_Adapter.h @@ -53,7 +53,7 @@ namespace TAO class TAO_Export PolicyFactory_Registry_Adapter { public: - virtual ~PolicyFactory_Registry_Adapter (void); + virtual ~PolicyFactory_Registry_Adapter (); /// Register a PolicyFactory with the underlying PolicyFactory /// sequence. This method should only be called during ORB diff --git a/TAO/tao/PolicyFactory_Registry_Factory.h b/TAO/tao/PolicyFactory_Registry_Factory.h index bc214fe55ba..19b6e383f72 100644 --- a/TAO/tao/PolicyFactory_Registry_Factory.h +++ b/TAO/tao/PolicyFactory_Registry_Factory.h @@ -34,9 +34,9 @@ class TAO_Export TAO_PolicyFactory_Registry_Factory : public ACE_Service_Object { public: - virtual ~TAO_PolicyFactory_Registry_Factory (void); + virtual ~TAO_PolicyFactory_Registry_Factory (); - virtual TAO::PolicyFactory_Registry_Adapter* create (void) = 0; + virtual TAO::PolicyFactory_Registry_Adapter* create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Policy_Current_Impl.h b/TAO/tao/Policy_Current_Impl.h index 98aaebff6f1..d370f8a7255 100644 --- a/TAO/tao/Policy_Current_Impl.h +++ b/TAO/tao/Policy_Current_Impl.h @@ -36,7 +36,7 @@ class TAO_Policy_Current_Impl { public: - TAO_Policy_Current_Impl (void); + TAO_Policy_Current_Impl (); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); diff --git a/TAO/tao/Policy_Set.h b/TAO/tao/Policy_Set.h index 36d8d6c7bc7..1e415564ecd 100644 --- a/TAO/tao/Policy_Set.h +++ b/TAO/tao/Policy_Set.h @@ -48,7 +48,7 @@ public: TAO_Policy_Set (const TAO_Policy_Set &rhs); /// Destructor - ~TAO_Policy_Set (void); + ~TAO_Policy_Set (); /// Copy the state from @a source, it uses the copy() operator to /// obtain independent copies of all the policies. @@ -93,14 +93,14 @@ public: /// @c CORBA::Policy::_nil () is returned if the policy doesn't /// exist. CORBA::Policy *get_policy_by_index (CORBA::ULong index) const; - CORBA::ULong num_policies (void) const; + CORBA::ULong num_policies () const; private: TAO_Policy_Set & operator= (const TAO_Policy_Set&); /// Remove and destroy all the policy objects owned by this policy /// manager. - void cleanup_i (void); + void cleanup_i (); /// Utility method to determine if a policy's scope is compatible with ours. CORBA::Boolean compatible_scope (TAO_Policy_Scope policy_scope) const; diff --git a/TAO/tao/Policy_Validator.h b/TAO/tao/Policy_Validator.h index b4ae5a0b7ad..8b26beb62f3 100644 --- a/TAO/tao/Policy_Validator.h +++ b/TAO/tao/Policy_Validator.h @@ -54,7 +54,7 @@ public: TAO_Policy_Validator (TAO_ORB_Core &orb_core); /// Destructor. - virtual ~TAO_Policy_Validator (void); + virtual ~TAO_Policy_Validator (); /** * Validate that the policies in the specified set diff --git a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h index 383f423fe73..88fa02f2182 100644 --- a/TAO/tao/PortableServer/Acceptor_Filter_Factory.h +++ b/TAO/tao/PortableServer/Acceptor_Filter_Factory.h @@ -50,12 +50,12 @@ class TAO_PortableServer_Export TAO_Acceptor_Filter_Factory : public ACE_Service_Object { public: - virtual ~TAO_Acceptor_Filter_Factory(void); + virtual ~TAO_Acceptor_Filter_Factory(); virtual TAO_Acceptor_Filter* create_object (TAO_POA_Manager& poamanager); /// Static initializer ensures the factory is loaded - static int initialize (void); + static int initialize (); }; diff --git a/TAO/tao/PortableServer/Active_Object_Map.h b/TAO/tao/PortableServer/Active_Object_Map.h index a37e2fcaee5..c2107759a9a 100644 --- a/TAO/tao/PortableServer/Active_Object_Map.h +++ b/TAO/tao/PortableServer/Active_Object_Map.h @@ -57,7 +57,7 @@ public: const TAO_Server_Strategy_Factory::Active_Object_Map_Creation_Parameters &creation_parameters); /// Destructor. - ~TAO_Active_Object_Map (void); + ~TAO_Active_Object_Map (); /// Must be used with UNIQUE_ID policy. int @@ -179,11 +179,11 @@ public: /// Size of the map. size_t - current_size (void); + current_size (); /// Can be used with any policy. static size_t - system_id_size (void); + system_id_size (); /// Set the system id size. static void @@ -302,7 +302,7 @@ class TAO_Id_Uniqueness_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Uniqueness_Strategy (void); + virtual ~TAO_Id_Uniqueness_Strategy (); /// Must be used with UNIQUE_ID policy. virtual int @@ -461,7 +461,7 @@ class TAO_Lifespan_Strategy public: /// Virtual destructor. - virtual ~TAO_Lifespan_Strategy (void); + virtual ~TAO_Lifespan_Strategy (); /// Can be used with any policy. virtual int @@ -533,7 +533,7 @@ class TAO_Id_Assignment_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Assignment_Strategy (void); + virtual ~TAO_Id_Assignment_Strategy (); /// Must be used with SYSTEM_ID policy. virtual int @@ -620,7 +620,7 @@ class TAO_Id_Hint_Strategy { public: /// Virtual destructor. - virtual ~TAO_Id_Hint_Strategy (void); + virtual ~TAO_Id_Hint_Strategy (); /// Find the user id from the system id. virtual int @@ -642,7 +642,7 @@ public: /// How big is the hint generated by this strategy? virtual size_t - hint_size (void) = 0; + hint_size () = 0; /// Get the system id associated with this entry. virtual int @@ -663,7 +663,7 @@ public: TAO_Active_Hint_Strategy (CORBA::ULong map_size); /// Virtual destructor. - virtual ~TAO_Active_Hint_Strategy (void); + virtual ~TAO_Active_Hint_Strategy (); virtual int recover_key (const PortableServer::ObjectId &system_id, @@ -680,7 +680,7 @@ public: TAO_Active_Object_Map_Entry *&entry); virtual size_t - hint_size (void); + hint_size (); virtual int system_id (PortableServer::ObjectId_out system_id, @@ -705,7 +705,7 @@ class TAO_No_Hint_Strategy : public TAO_Id_Hint_Strategy { public: /// Virtual destructor. - virtual ~TAO_No_Hint_Strategy (void); + virtual ~TAO_No_Hint_Strategy (); virtual int recover_key (const PortableServer::ObjectId &system_id, @@ -722,7 +722,7 @@ public: TAO_Active_Object_Map_Entry *&entry); virtual size_t - hint_size (void); + hint_size (); virtual int system_id (PortableServer::ObjectId_out system_id, diff --git a/TAO/tao/PortableServer/Active_Object_Map_Entry.h b/TAO/tao/PortableServer/Active_Object_Map_Entry.h index 8fc2c4504d8..45429d8b0e8 100644 --- a/TAO/tao/PortableServer/Active_Object_Map_Entry.h +++ b/TAO/tao/PortableServer/Active_Object_Map_Entry.h @@ -35,7 +35,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL struct TAO_Active_Object_Map_Entry { /// Default constructor. - TAO_Active_Object_Map_Entry (void); + TAO_Active_Object_Map_Entry (); /// User id. PortableServer::ObjectId user_id_; diff --git a/TAO/tao/PortableServer/Active_Policy_Strategies.h b/TAO/tao/PortableServer/Active_Policy_Strategies.h index 2e38ebd132e..b683ed244eb 100644 --- a/TAO/tao/PortableServer/Active_Policy_Strategies.h +++ b/TAO/tao/PortableServer/Active_Policy_Strategies.h @@ -50,26 +50,26 @@ namespace TAO class Active_Policy_Strategies { public: - Active_Policy_Strategies (void); + Active_Policy_Strategies (); void update (Cached_Policies &policies, TAO_Root_POA* poa); - void cleanup (void); + void cleanup (); - ThreadStrategy *thread_strategy (void) const; + ThreadStrategy *thread_strategy () const; - RequestProcessingStrategy *request_processing_strategy (void) const; + RequestProcessingStrategy *request_processing_strategy () const; - IdAssignmentStrategy *id_assignment_strategy (void) const; + IdAssignmentStrategy *id_assignment_strategy () const; - IdUniquenessStrategy *id_uniqueness_strategy (void) const; + IdUniquenessStrategy *id_uniqueness_strategy () const; - LifespanStrategy *lifespan_strategy (void) const; + LifespanStrategy *lifespan_strategy () const; - ImplicitActivationStrategy *implicit_activation_strategy (void) const; + ImplicitActivationStrategy *implicit_activation_strategy () const; - ServantRetentionStrategy *servant_retention_strategy (void) const; + ServantRetentionStrategy *servant_retention_strategy () const; private: ThreadStrategy *thread_strategy_; @@ -97,9 +97,9 @@ namespace TAO { public: Active_Policy_Strategies_Cleanup_Guard (Active_Policy_Strategies *p); - ~Active_Policy_Strategies_Cleanup_Guard (void); + ~Active_Policy_Strategies_Cleanup_Guard (); - Active_Policy_Strategies *_retn (void); + Active_Policy_Strategies *_retn (); private: Active_Policy_Strategies *ptr_; diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.h b/TAO/tao/PortableServer/Basic_SArgument_T.h index ab9d9e0e694..634f04ef1e3 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Basic_SArgument_T.h @@ -34,13 +34,13 @@ namespace TAO class In_Basic_SArgument_T : public InArgument { public: - In_Basic_SArgument_T (void); + In_Basic_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S arg (void) const; + S arg () const; private: S x_; @@ -56,14 +56,14 @@ namespace TAO class Inout_Basic_SArgument_T : public InoutArgument { public: - Inout_Basic_SArgument_T (void); + Inout_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -79,13 +79,13 @@ namespace TAO class Out_Basic_SArgument_T : public OutArgument { public: - Out_Basic_SArgument_T (void); + Out_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -101,13 +101,13 @@ namespace TAO class Ret_Basic_SArgument_T : public RetArgument { public: - Ret_Basic_SArgument_T (void); + Ret_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; diff --git a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h index 384db9dc465..656de9a53d2 100644 --- a/TAO/tao/PortableServer/Collocated_Arguments_Converter.h +++ b/TAO/tao/PortableServer/Collocated_Arguments_Converter.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export Collocated_Arguments_Converter : { public: - virtual ~Collocated_Arguments_Converter (void); + virtual ~Collocated_Arguments_Converter (); virtual void convert_request (TAO_ServerRequest & server_request, TAO::Argument * const args[], diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp index 572842ebe02..fa862566239 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.cpp @@ -210,13 +210,13 @@ namespace TAO // ----------------------------------------------------- TAO::Collocated_Object_Proxy_Broker * -the_tao_collocated_object_proxy_broker (void) +the_tao_collocated_object_proxy_broker () { static TAO::Collocated_Object_Proxy_Broker the_broker; return &the_broker; } -TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory (void) +TAO::Object_Proxy_Broker * _TAO_collocation_Object_Proxy_Broker_Factory () { return the_tao_collocated_object_proxy_broker (); } diff --git a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h index 45c29fc8f13..fcd7e2f0db8 100644 --- a/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h +++ b/TAO/tao/PortableServer/Collocated_Object_Proxy_Broker.h @@ -66,7 +66,7 @@ namespace TAO /// This function is used to access the unique instance of strategized /// proxy broker. All the CORBA::Object share the proxy broker. -TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (void); +TAO::Collocated_Object_Proxy_Broker *the_tao_collocated_object_proxy_broker (); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Creation_Time.h b/TAO/tao/PortableServer/Creation_Time.h index 18de6b7250e..4b13c32be55 100644 --- a/TAO/tao/PortableServer/Creation_Time.h +++ b/TAO/tao/PortableServer/Creation_Time.h @@ -35,13 +35,13 @@ namespace TAO public: explicit Creation_Time (const ACE_Time_Value &creation_time); - Creation_Time (void); + Creation_Time (); void creation_time (const void *creation_time); - const void *creation_time (void) const; + const void *creation_time () const; - static CORBA::ULong creation_time_length (void); + static CORBA::ULong creation_time_length (); bool operator== (const Creation_Time &rhs) const; @@ -76,7 +76,7 @@ namespace TAO { public: - Temporary_Creation_Time (void); + Temporary_Creation_Time (); void creation_time (const void *creation_time); diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp index 7c4a1d1412e..ec9ae61a7a8 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.cpp @@ -6,7 +6,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter (void) +TAO_Default_Acceptor_Filter::TAO_Default_Acceptor_Filter () { } diff --git a/TAO/tao/PortableServer/Default_Acceptor_Filter.h b/TAO/tao/PortableServer/Default_Acceptor_Filter.h index 5e811e4f16e..c440b985c5d 100644 --- a/TAO/tao/PortableServer/Default_Acceptor_Filter.h +++ b/TAO/tao/PortableServer/Default_Acceptor_Filter.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export TAO_Default_Acceptor_Filter : public TAO_Acceptor_Filter { public: - TAO_Default_Acceptor_Filter (void); + TAO_Default_Acceptor_Filter (); /// Populate @a mprofile with all available endpoints. virtual int fill_profile (const TAO::ObjectKey &object_key, diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.cpp b/TAO/tao/PortableServer/Default_Policy_Validator.cpp index 1c852f9d8a4..84c6d9f06a2 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.cpp +++ b/TAO/tao/PortableServer/Default_Policy_Validator.cpp @@ -12,7 +12,7 @@ TAO_POA_Default_Policy_Validator::TAO_POA_Default_Policy_Validator ( { } -TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator (void) +TAO_POA_Default_Policy_Validator::~TAO_POA_Default_Policy_Validator () { } diff --git a/TAO/tao/PortableServer/Default_Policy_Validator.h b/TAO/tao/PortableServer/Default_Policy_Validator.h index 5642928e9d0..e0f17e71dd4 100644 --- a/TAO/tao/PortableServer/Default_Policy_Validator.h +++ b/TAO/tao/PortableServer/Default_Policy_Validator.h @@ -35,7 +35,7 @@ public: TAO_POA_Default_Policy_Validator (TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_POA_Default_Policy_Validator (void); + ~TAO_POA_Default_Policy_Validator (); protected: /** diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp index ec83ebed582..ff020b8af2d 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher (void) +TAO_Default_Servant_Dispatcher::~TAO_Default_Servant_Dispatcher () { } diff --git a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h index 20abb7509be..a77043c28d2 100644 --- a/TAO/tao/PortableServer/Default_Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Default_Servant_Dispatcher.h @@ -34,7 +34,7 @@ class TAO_PortableServer_Export TAO_Default_Servant_Dispatcher : public TAO_Servant_Dispatcher { public: - virtual ~TAO_Default_Servant_Dispatcher (void); + virtual ~TAO_Default_Servant_Dispatcher (); /// Pre_invoke remote request. void pre_invoke_remote_request ( diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h index 7d0b27b8cc1..44889cf37be 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.h @@ -56,7 +56,7 @@ namespace TAO //@} /// Retrieve underlying argument. - S const & arg (void) const; + S const & arg () const; private: @@ -79,7 +79,7 @@ namespace TAO public: /// Constructor. - Inout_Fixed_Size_SArgument_T (void); + Inout_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -97,7 +97,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: @@ -118,7 +118,7 @@ namespace TAO public: /// Constructor. - Out_Fixed_Size_SArgument_T (void); + Out_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -135,7 +135,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: @@ -157,7 +157,7 @@ namespace TAO public: /// Constructor. - Ret_Fixed_Size_SArgument_T (void); + Ret_Fixed_Size_SArgument_T (); /** * @name @c TAO::Argument Method Overrides @@ -174,7 +174,7 @@ namespace TAO #endif /* TAO_HAS_INTERCEPTORS == 1 */ //@} - S & arg (void); + S & arg (); private: diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp index 449065c15c2..21f763b3aa6 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - IdAssignmentPolicy::copy (void) + IdAssignmentPolicy::copy () { IdAssignmentPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - IdAssignmentPolicy::destroy (void) + IdAssignmentPolicy::destroy () { } ::PortableServer::IdAssignmentPolicyValue - IdAssignmentPolicy::value (void) + IdAssignmentPolicy::value () { return value_; } CORBA::PolicyType - IdAssignmentPolicy::policy_type (void) + IdAssignmentPolicy::policy_type () { return ::PortableServer::ID_ASSIGNMENT_POLICY_ID; } TAO_Cached_Policy_Type - IdAssignmentPolicy::_tao_cached_type (void) const + IdAssignmentPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_ID_ASSIGNMENT; } TAO_Policy_Scope - IdAssignmentPolicy::_tao_scope (void) const + IdAssignmentPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/IdAssignmentPolicy.h b/TAO/tao/PortableServer/IdAssignmentPolicy.h index c2688b5f98a..82686e026dc 100644 --- a/TAO/tao/PortableServer/IdAssignmentPolicy.h +++ b/TAO/tao/PortableServer/IdAssignmentPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: IdAssignmentPolicy (::PortableServer::IdAssignmentPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::IdAssignmentPolicyValue value (void); + ::PortableServer::IdAssignmentPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::IdAssignmentPolicyValue value_; diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp index aa56af91575..100a129d208 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.cpp @@ -12,12 +12,12 @@ namespace TAO } void - IdAssignmentStrategy::strategy_cleanup(void) + IdAssignmentStrategy::strategy_cleanup() { } char - IdAssignmentStrategy::key_type_length (void) const + IdAssignmentStrategy::key_type_length () const { return sizeof (char); } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategy.h b/TAO/tao/PortableServer/IdAssignmentStrategy.h index 88bcfce0eee..dca18216db1 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategy.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategy.h @@ -32,21 +32,21 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); /** * Returns the key type the says which specific policy we have */ - virtual char id_assignment_key_type (void) const = 0; + virtual char id_assignment_key_type () const = 0; /** * Returns the length of the id_assignment type */ - char key_type_length (void) const; + char key_type_length () const; void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); - virtual bool has_system_id (void) const = 0; + virtual bool has_system_id () const = 0; }; } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp index dd95809054b..30d87e69e9f 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.cpp @@ -8,13 +8,13 @@ namespace TAO namespace Portable_Server { char - IdAssignmentStrategySystem::id_assignment_key_type (void) const + IdAssignmentStrategySystem::id_assignment_key_type () const { return 'S'; } bool - IdAssignmentStrategySystem::has_system_id (void) const + IdAssignmentStrategySystem::has_system_id () const { return true; } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h index e57fc043e30..7ee2acb36f4 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategySystem.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategySystem.h @@ -31,9 +31,9 @@ namespace TAO : public IdAssignmentStrategy { public: - virtual char id_assignment_key_type (void) const; + virtual char id_assignment_key_type () const; - virtual bool has_system_id (void) const; + virtual bool has_system_id () const; }; } } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp index 57685cf2f83..622dbd3f4ef 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.cpp @@ -7,13 +7,13 @@ namespace TAO namespace Portable_Server { char - IdAssignmentStrategyUser::id_assignment_key_type (void) const + IdAssignmentStrategyUser::id_assignment_key_type () const { return 'U'; } bool - IdAssignmentStrategyUser::has_system_id (void) const + IdAssignmentStrategyUser::has_system_id () const { return false; } diff --git a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h index 7740e89ee86..c64be097bce 100644 --- a/TAO/tao/PortableServer/IdAssignmentStrategyUser.h +++ b/TAO/tao/PortableServer/IdAssignmentStrategyUser.h @@ -31,9 +31,9 @@ namespace TAO : public IdAssignmentStrategy { public: - virtual char id_assignment_key_type (void) const; + virtual char id_assignment_key_type () const; - virtual bool has_system_id (void) const; + virtual bool has_system_id () const; }; } } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp index aedf4a9b876..ce0297809b5 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.cpp +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - IdUniquenessPolicy::copy (void) + IdUniquenessPolicy::copy () { IdUniquenessPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - IdUniquenessPolicy::destroy (void) + IdUniquenessPolicy::destroy () { } ::PortableServer::IdUniquenessPolicyValue - IdUniquenessPolicy::value (void) + IdUniquenessPolicy::value () { return value_; } CORBA::PolicyType - IdUniquenessPolicy::policy_type (void) + IdUniquenessPolicy::policy_type () { return ::PortableServer::ID_UNIQUENESS_POLICY_ID; } TAO_Cached_Policy_Type - IdUniquenessPolicy::_tao_cached_type (void) const + IdUniquenessPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_ID_UNIQUENESS; } TAO_Policy_Scope - IdUniquenessPolicy::_tao_scope (void) const + IdUniquenessPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/IdUniquenessPolicy.h b/TAO/tao/PortableServer/IdUniquenessPolicy.h index d621b5b9d17..3ecbf3b3492 100644 --- a/TAO/tao/PortableServer/IdUniquenessPolicy.h +++ b/TAO/tao/PortableServer/IdUniquenessPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: IdUniquenessPolicy (::PortableServer::IdUniquenessPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::IdUniquenessPolicyValue value (void); + ::PortableServer::IdUniquenessPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::IdUniquenessPolicyValue value_; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategy.h b/TAO/tao/PortableServer/IdUniquenessStrategy.h index 210d3284ddb..b3372d94343 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategy.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategy.h @@ -41,7 +41,7 @@ namespace TAO PortableServer::Servant s, bool &w) = 0; - virtual bool allow_multiple_activations (void) const = 0; + virtual bool allow_multiple_activations () const = 0; virtual ::PortableServer::IdUniquenessPolicyValue type() const = 0; }; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp index fde3e6c68e2..170d4a18643 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.cpp @@ -13,7 +13,7 @@ namespace TAO } void - IdUniquenessStrategyMultiple::strategy_cleanup (void) + IdUniquenessStrategyMultiple::strategy_cleanup () { } @@ -28,7 +28,7 @@ namespace TAO } bool - IdUniquenessStrategyMultiple::allow_multiple_activations (void) const + IdUniquenessStrategyMultiple::allow_multiple_activations () const { return true; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h index b64983f446b..5b1c7ba96eb 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyMultiple.h @@ -33,13 +33,13 @@ namespace TAO public: virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, bool &w); - virtual bool allow_multiple_activations (void) const; + virtual bool allow_multiple_activations () const; virtual ::PortableServer::IdUniquenessPolicyValue type() const; }; diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp index 89a795db50f..30563653abf 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.cpp @@ -7,7 +7,7 @@ namespace TAO { namespace Portable_Server { - IdUniquenessStrategyUnique::IdUniquenessStrategyUnique (void) : + IdUniquenessStrategyUnique::IdUniquenessStrategyUnique () : poa_ (0) { } @@ -22,7 +22,7 @@ namespace TAO void IdUniquenessStrategyUnique::strategy_cleanup ( - void) + ) { poa_ = 0; } @@ -42,7 +42,7 @@ namespace TAO } bool - IdUniquenessStrategyUnique::allow_multiple_activations (void) const + IdUniquenessStrategyUnique::allow_multiple_activations () const { return false; } diff --git a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h index fe25b407ce8..ba910f7dc0f 100644 --- a/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h +++ b/TAO/tao/PortableServer/IdUniquenessStrategyUnique.h @@ -31,17 +31,17 @@ namespace TAO : public IdUniquenessStrategy { public: - IdUniquenessStrategyUnique (void); + IdUniquenessStrategyUnique (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); virtual bool is_servant_activation_allowed ( PortableServer::Servant servant, bool &wait_occurred_restart_call); - virtual bool allow_multiple_activations (void) const; + virtual bool allow_multiple_activations () const; virtual ::PortableServer::IdUniquenessPolicyValue type() const; diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp index a21645d1b04..359f2b7f26b 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.cpp +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.cpp @@ -6,7 +6,7 @@ namespace TAO { namespace Portable_Server { - ImR_Client_Adapter::~ImR_Client_Adapter (void) + ImR_Client_Adapter::~ImR_Client_Adapter () { } } diff --git a/TAO/tao/PortableServer/ImR_Client_Adapter.h b/TAO/tao/PortableServer/ImR_Client_Adapter.h index b3113da36a9..5f183ef335c 100644 --- a/TAO/tao/PortableServer/ImR_Client_Adapter.h +++ b/TAO/tao/PortableServer/ImR_Client_Adapter.h @@ -52,7 +52,7 @@ namespace TAO public ACE_Service_Object { public: - virtual ~ImR_Client_Adapter (void); + virtual ~ImR_Client_Adapter (); /// ImplRepo helper method, notify the ImplRepo on startup virtual void imr_notify_startup (TAO_Root_POA* poa ) = 0; diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp index a2429e9d9a0..ee97fc016db 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.cpp @@ -17,7 +17,7 @@ namespace TAO } CORBA::Policy_ptr - ImplicitActivationPolicy::copy (void) + ImplicitActivationPolicy::copy () { ImplicitActivationPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -28,30 +28,30 @@ namespace TAO } void - ImplicitActivationPolicy::destroy (void) + ImplicitActivationPolicy::destroy () { } ::PortableServer::ImplicitActivationPolicyValue - ImplicitActivationPolicy::value (void) + ImplicitActivationPolicy::value () { return value_; } CORBA::PolicyType - ImplicitActivationPolicy::policy_type (void) + ImplicitActivationPolicy::policy_type () { return ::PortableServer::IMPLICIT_ACTIVATION_POLICY_ID; } TAO_Cached_Policy_Type - ImplicitActivationPolicy::_tao_cached_type (void) const + ImplicitActivationPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_IMPLICIT_ACTIVATION; } TAO_Policy_Scope - ImplicitActivationPolicy::_tao_scope (void) const + ImplicitActivationPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ImplicitActivationPolicy.h b/TAO/tao/PortableServer/ImplicitActivationPolicy.h index 861d6b4645d..9a418378fea 100644 --- a/TAO/tao/PortableServer/ImplicitActivationPolicy.h +++ b/TAO/tao/PortableServer/ImplicitActivationPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ImplicitActivationPolicy (::PortableServer::ImplicitActivationPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ImplicitActivationPolicyValue value (void); + ::PortableServer::ImplicitActivationPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ImplicitActivationPolicyValue value_; diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp index 41e8002c1c9..3bc68da0d7e 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.cpp @@ -14,7 +14,7 @@ namespace TAO } void - ImplicitActivationStrategy::strategy_cleanup (void) + ImplicitActivationStrategy::strategy_cleanup () { } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategy.h b/TAO/tao/PortableServer/ImplicitActivationStrategy.h index 70f1731d28d..491df8cf702 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategy.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategy.h @@ -30,9 +30,9 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - virtual bool allow_implicit_activation (void) const = 0; + virtual bool allow_implicit_activation () const = 0; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp index 30859b6a30e..98c308606d8 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.cpp @@ -8,7 +8,7 @@ namespace TAO namespace Portable_Server { bool - ImplicitActivationStrategyExplicit::allow_implicit_activation (void) const + ImplicitActivationStrategyExplicit::allow_implicit_activation () const { return false; } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h index 19c1dfb44ff..05846df574a 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyExplicit.h @@ -31,7 +31,7 @@ namespace TAO public ImplicitActivationStrategy { public: - virtual bool allow_implicit_activation (void) const; + virtual bool allow_implicit_activation () const; }; } } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp index 0be943ee21c..989dd133b88 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.cpp @@ -9,7 +9,7 @@ namespace TAO namespace Portable_Server { bool - ImplicitActivationStrategyImplicit::allow_implicit_activation (void) const + ImplicitActivationStrategyImplicit::allow_implicit_activation () const { return true; } diff --git a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h index 06d74edcd93..68d0a997130 100644 --- a/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h +++ b/TAO/tao/PortableServer/ImplicitActivationStrategyImplicit.h @@ -33,7 +33,7 @@ namespace TAO : public ImplicitActivationStrategy { public: - virtual bool allow_implicit_activation (void) const; + virtual bool allow_implicit_activation () const; }; } } diff --git a/TAO/tao/PortableServer/Key_Adapters.cpp b/TAO/tao/PortableServer/Key_Adapters.cpp index c7ccba1f38c..b48962042fc 100644 --- a/TAO/tao/PortableServer/Key_Adapters.cpp +++ b/TAO/tao/PortableServer/Key_Adapters.cpp @@ -7,7 +7,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator (void) +TAO_Incremental_Key_Generator::TAO_Incremental_Key_Generator () : counter_ (0) { } diff --git a/TAO/tao/PortableServer/Key_Adapters.h b/TAO/tao/PortableServer/Key_Adapters.h index 330c219efc8..9bbc42e51ea 100644 --- a/TAO/tao/PortableServer/Key_Adapters.h +++ b/TAO/tao/PortableServer/Key_Adapters.h @@ -40,7 +40,7 @@ class TAO_Incremental_Key_Generator { public: - TAO_Incremental_Key_Generator (void); + TAO_Incremental_Key_Generator (); int operator() (PortableServer::ObjectId &id); diff --git a/TAO/tao/PortableServer/LifespanPolicy.cpp b/TAO/tao/PortableServer/LifespanPolicy.cpp index e9d7a4bcd43..04c9a86b4ce 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.cpp +++ b/TAO/tao/PortableServer/LifespanPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - LifespanPolicy::copy (void) + LifespanPolicy::copy () { LifespanPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - LifespanPolicy::destroy (void) + LifespanPolicy::destroy () { } ::PortableServer::LifespanPolicyValue - LifespanPolicy::value (void) + LifespanPolicy::value () { return value_; } CORBA::PolicyType - LifespanPolicy::policy_type (void) + LifespanPolicy::policy_type () { return ::PortableServer::LIFESPAN_POLICY_ID; } TAO_Cached_Policy_Type - LifespanPolicy::_tao_cached_type (void) const + LifespanPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_LIFESPAN; } TAO_Policy_Scope - LifespanPolicy::_tao_scope (void) const + LifespanPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/LifespanPolicy.h b/TAO/tao/PortableServer/LifespanPolicy.h index 0caa634b327..20b90910f9a 100644 --- a/TAO/tao/PortableServer/LifespanPolicy.h +++ b/TAO/tao/PortableServer/LifespanPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: LifespanPolicy (::PortableServer::LifespanPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::LifespanPolicyValue value (void); + ::PortableServer::LifespanPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::LifespanPolicyValue value_; diff --git a/TAO/tao/PortableServer/LifespanStrategy.cpp b/TAO/tao/PortableServer/LifespanStrategy.cpp index c87eec3b84e..e331e653adb 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.cpp +++ b/TAO/tao/PortableServer/LifespanStrategy.cpp @@ -26,13 +26,13 @@ namespace TAO } void - LifespanStrategy::strategy_cleanup (void) + LifespanStrategy::strategy_cleanup () { poa_ = 0; } CORBA::ULong - LifespanStrategy::key_type_length (void) const + LifespanStrategy::key_type_length () const { return sizeof (char); } diff --git a/TAO/tao/PortableServer/LifespanStrategy.h b/TAO/tao/PortableServer/LifespanStrategy.h index da64516525c..6aaa52a0bdf 100644 --- a/TAO/tao/PortableServer/LifespanStrategy.h +++ b/TAO/tao/PortableServer/LifespanStrategy.h @@ -33,17 +33,17 @@ namespace TAO : public Policy_Strategy { public: - LifespanStrategy (void); + LifespanStrategy (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup (void); + virtual void strategy_cleanup (); void create (const char *name, const TAO::ObjectKey &key); - virtual void notify_startup (void) = 0; + virtual void notify_startup () = 0; - virtual void notify_shutdown (void) = 0; + virtual void notify_shutdown () = 0; /** * Validate the passed object key if it belongs to this POA. @@ -53,12 +53,12 @@ namespace TAO /** * Returns the length of the key type */ - virtual CORBA::ULong key_length (void) const = 0; + virtual CORBA::ULong key_length () const = 0; - CORBA::ULong key_type_length (void) const; + CORBA::ULong key_type_length () const; /// Do we have set persistent or not, - virtual CORBA::Boolean is_persistent (void) const = 0; + virtual CORBA::Boolean is_persistent () const = 0; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at) = 0; @@ -68,7 +68,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const = 0; /// Check the state of the POA. - virtual void check_state (void) = 0; + virtual void check_state () = 0; virtual ::PortableServer::LifespanPolicyValue type () const = 0; diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp index 2ccf947ccf9..62f681a6f18 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.cpp @@ -31,13 +31,13 @@ namespace TAO } char - LifespanStrategyPersistent::key_type (void) const + LifespanStrategyPersistent::key_type () const { return 'P'; } CORBA::Boolean - LifespanStrategyPersistent::is_persistent (void) const + LifespanStrategyPersistent::is_persistent () const { return true; } @@ -59,7 +59,7 @@ namespace TAO } void - LifespanStrategyPersistent::notify_startup (void) + LifespanStrategyPersistent::notify_startup () { if (this->use_imr_) { @@ -104,7 +104,7 @@ namespace TAO } void - LifespanStrategyPersistent::notify_shutdown (void) + LifespanStrategyPersistent::notify_shutdown () { ImR_Client_Adapter *adapter = ACE_Dynamic_Service<ImR_Client_Adapter>::instance ( @@ -122,7 +122,7 @@ namespace TAO } void - LifespanStrategyPersistent::check_state (void) + LifespanStrategyPersistent::check_state () { this->poa_->tao_poa_manager().check_state (); } diff --git a/TAO/tao/PortableServer/LifespanStrategyPersistent.h b/TAO/tao/PortableServer/LifespanStrategyPersistent.h index 62d56f94e17..03d2075f81d 100644 --- a/TAO/tao/PortableServer/LifespanStrategyPersistent.h +++ b/TAO/tao/PortableServer/LifespanStrategyPersistent.h @@ -36,15 +36,15 @@ namespace TAO virtual void strategy_init(TAO_Root_POA *poa); - virtual void notify_startup (void); + virtual void notify_startup (); - virtual void notify_shutdown (void); + virtual void notify_shutdown (); - char key_type (void) const; + char key_type () const; - virtual CORBA::Boolean is_persistent (void) const; + virtual CORBA::Boolean is_persistent () const; - CORBA::ULong key_length (void) const; + CORBA::ULong key_length () const; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); @@ -53,7 +53,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; /// Check the state of the POA. - virtual void check_state (void); + virtual void check_state (); virtual ::PortableServer::LifespanPolicyValue type() const; diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp index a701ad0398c..268ea7b3546 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.cpp +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.cpp @@ -19,17 +19,17 @@ namespace TAO } void - LifespanStrategyTransient::notify_startup (void) + LifespanStrategyTransient::notify_startup () { } void - LifespanStrategyTransient::notify_shutdown (void) + LifespanStrategyTransient::notify_shutdown () { } CORBA::Boolean - LifespanStrategyTransient::is_persistent (void) const + LifespanStrategyTransient::is_persistent () const { return false; } @@ -44,7 +44,7 @@ namespace TAO } CORBA::ULong - LifespanStrategyTransient::key_length (void) const + LifespanStrategyTransient::key_length () const { CORBA::ULong keylength = sizeof (char); @@ -77,13 +77,13 @@ namespace TAO } char - LifespanStrategyTransient::key_type (void) const + LifespanStrategyTransient::key_type () const { return 'T'; } void - LifespanStrategyTransient::check_state (void) + LifespanStrategyTransient::check_state () { if (this->poa_->tao_poa_manager ().get_state_i () == PortableServer::POAManager::INACTIVE) diff --git a/TAO/tao/PortableServer/LifespanStrategyTransient.h b/TAO/tao/PortableServer/LifespanStrategyTransient.h index a3ef34c46fa..161994e964a 100644 --- a/TAO/tao/PortableServer/LifespanStrategyTransient.h +++ b/TAO/tao/PortableServer/LifespanStrategyTransient.h @@ -31,17 +31,17 @@ namespace TAO : public LifespanStrategy { public: - LifespanStrategyTransient (void); + LifespanStrategyTransient (); - virtual void notify_startup (void); + virtual void notify_startup (); - virtual void notify_shutdown (void); + virtual void notify_shutdown (); - char key_type (void) const; + char key_type () const; - virtual CORBA::Boolean is_persistent (void) const; + virtual CORBA::Boolean is_persistent () const; - CORBA::ULong key_length (void) const; + CORBA::ULong key_length () const; virtual void create_key (CORBA::Octet *buffer, CORBA::ULong& starting_at); @@ -50,7 +50,7 @@ namespace TAO const TAO::Portable_Server::Temporary_Creation_Time& creation_time) const; /// Check the state of the POA. - virtual void check_state (void); + virtual void check_state (); virtual ::PortableServer::LifespanPolicyValue type() const; diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.cpp b/TAO/tao/PortableServer/Network_Priority_Hook.cpp index b143ac6a441..50efd1ee5af 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.cpp +++ b/TAO/tao/PortableServer/Network_Priority_Hook.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook(void) +TAO_Network_Priority_Hook::~TAO_Network_Priority_Hook() { } @@ -25,7 +25,7 @@ TAO_Network_Priority_Hook::set_dscp_codepoint ( } int -TAO_Network_Priority_Hook::initialize (void) +TAO_Network_Priority_Hook::initialize () { return ACE_Service_Config::process_directive (ace_svc_desc_TAO_Network_Priority_Hook); diff --git a/TAO/tao/PortableServer/Network_Priority_Hook.h b/TAO/tao/PortableServer/Network_Priority_Hook.h index 756e587e26d..29e4cfb2834 100644 --- a/TAO/tao/PortableServer/Network_Priority_Hook.h +++ b/TAO/tao/PortableServer/Network_Priority_Hook.h @@ -39,7 +39,7 @@ class TAO_PortableServer_Export TAO_Network_Priority_Hook : public ACE_Service_Object { public: - virtual ~TAO_Network_Priority_Hook(void); + virtual ~TAO_Network_Priority_Hook(); virtual void update_network_priority (TAO_Root_POA& poa, TAO_POA_Policy_Set& poa_policy_set); @@ -49,7 +49,7 @@ public: TAO_Root_POA& poa); /// Static initializer ensures the factory is loaded - static int initialize (void); + static int initialize (); }; diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp index e00befdbd1d..58bb91a3936 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.cpp @@ -43,7 +43,7 @@ namespace TAO this->object_adapter_.lock ().release (); } - Non_Servant_Upcall::~Non_Servant_Upcall (void) + Non_Servant_Upcall::~Non_Servant_Upcall () { // Reacquire the Object Adapter lock. this->object_adapter_.lock ().acquire (); diff --git a/TAO/tao/PortableServer/Non_Servant_Upcall.h b/TAO/tao/PortableServer/Non_Servant_Upcall.h index c05b50db449..75041660593 100644 --- a/TAO/tao/PortableServer/Non_Servant_Upcall.h +++ b/TAO/tao/PortableServer/Non_Servant_Upcall.h @@ -53,9 +53,9 @@ namespace TAO Non_Servant_Upcall (::TAO_Root_POA &poa); /// Destructor. - ~Non_Servant_Upcall (void); + ~Non_Servant_Upcall (); - ::TAO_Root_POA &poa (void) const; + ::TAO_Root_POA &poa () const; protected: diff --git a/TAO/tao/PortableServer/ORT_Adapter.h b/TAO/tao/PortableServer/ORT_Adapter.h index 3e7c6b12e3c..ed4e5f5d052 100644 --- a/TAO/tao/PortableServer/ORT_Adapter.h +++ b/TAO/tao/PortableServer/ORT_Adapter.h @@ -68,11 +68,11 @@ namespace TAO /// Accessor methods to ObjectReferenceTemplate template virtual PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (void) = 0; + get_adapter_template () = 0; /// Accessor methods to PortableInterceptor::ObjectReferenceFactory virtual PortableInterceptor::ObjectReferenceFactory * - get_obj_ref_factory (void) = 0; + get_obj_ref_factory () = 0; /// Release any references on @c ObjectReferenceTemplate @a t. virtual void release ( diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp index e499d3aa1b0..0411ff7be0b 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.cpp @@ -4,7 +4,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL namespace TAO { - ORT_Adapter_Factory::~ORT_Adapter_Factory (void) + ORT_Adapter_Factory::~ORT_Adapter_Factory () { } } diff --git a/TAO/tao/PortableServer/ORT_Adapter_Factory.h b/TAO/tao/PortableServer/ORT_Adapter_Factory.h index 3e018602d4a..d2d1df23f1e 100644 --- a/TAO/tao/PortableServer/ORT_Adapter_Factory.h +++ b/TAO/tao/PortableServer/ORT_Adapter_Factory.h @@ -55,7 +55,7 @@ namespace TAO * line option. Apparently the compiler generated * destructor is inlined. */ - virtual ~ORT_Adapter_Factory (void); + virtual ~ORT_Adapter_Factory (); /// Create a new adapter, in case not possible to allocate, returns 0 virtual TAO::ORT_Adapter * create () = 0; diff --git a/TAO/tao/PortableServer/Object_Adapter.cpp b/TAO/tao/PortableServer/Object_Adapter.cpp index 781a60c24b4..b8cd2a2d059 100644 --- a/TAO/tao/PortableServer/Object_Adapter.cpp +++ b/TAO/tao/PortableServer/Object_Adapter.cpp @@ -292,7 +292,7 @@ TAO_Object_Adapter::init_default_policies (TAO_POA_Policy_Set &policies) #endif } -TAO_Object_Adapter::~TAO_Object_Adapter (void) +TAO_Object_Adapter::~TAO_Object_Adapter () { delete this->hint_strategy_; delete this->persistent_poa_name_map_; @@ -552,7 +552,7 @@ TAO_Object_Adapter::find_servant_i (const TAO::ObjectKey &key, } void -TAO_Object_Adapter::open (void) +TAO_Object_Adapter::open () { // Add in the default POA policies to the default list. this->init_default_policies (this->default_poa_policies ()); @@ -691,7 +691,7 @@ TAO_Object_Adapter::check_close (int wait_for_completion) } int -TAO_Object_Adapter::priority (void) const +TAO_Object_Adapter::priority () const { return 0; } @@ -828,13 +828,13 @@ TAO_Object_Adapter::dispatch (TAO::ObjectKey &key, } const char * -TAO_Object_Adapter::name (void) const +TAO_Object_Adapter::name () const { return TAO_OBJID_ROOTPOA; } CORBA::Object_ptr -TAO_Object_Adapter::root (void) +TAO_Object_Adapter::root () { return CORBA::Object::_duplicate (this->root_); } @@ -935,7 +935,7 @@ TAO_Object_Adapter::get_collocated_servant (const TAO_MProfile &mp) // **************************************************************** -TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy (void) +TAO_Object_Adapter::Hint_Strategy::~Hint_Strategy () { } @@ -950,7 +950,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::Active_Hint_Strategy (CORBA::ULong map { } -TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy (void) +TAO_Object_Adapter::Active_Hint_Strategy::~Active_Hint_Strategy () { } @@ -1023,7 +1023,7 @@ TAO_Object_Adapter::Active_Hint_Strategy::unbind_persistent_poa ( return result; } -TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy (void) +TAO_Object_Adapter::No_Hint_Strategy::~No_Hint_Strategy () { } @@ -1114,7 +1114,7 @@ TAO_Object_Adapter::poa_name_iterator::operator* () const } TAO_Object_Adapter::poa_name_iterator & -TAO_Object_Adapter::poa_name_iterator::operator++ (void) +TAO_Object_Adapter::poa_name_iterator::operator++ () { for (this->last_separator_ = this->position_; ; @@ -1140,7 +1140,7 @@ TAO_Object_Adapter::iteratable_poa_name::iteratable_poa_name ( } TAO_Object_Adapter::iteratable_poa_name::iterator -TAO_Object_Adapter::iteratable_poa_name::begin (void) const +TAO_Object_Adapter::iteratable_poa_name::begin () const { return iterator (1, this->folded_name_.length (), @@ -1148,7 +1148,7 @@ TAO_Object_Adapter::iteratable_poa_name::begin (void) const } TAO_Object_Adapter::iteratable_poa_name::iterator -TAO_Object_Adapter::iteratable_poa_name::end (void) const +TAO_Object_Adapter::iteratable_poa_name::end () const { return iterator (0, this->folded_name_.length (), @@ -1156,7 +1156,7 @@ TAO_Object_Adapter::iteratable_poa_name::end (void) const } void -TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) +TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete () { // Check if a non-servant upcall is in progress. If a non-servant // upcall is in progress, wait for it to complete. Unless of @@ -1173,7 +1173,7 @@ TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete (void) } void -TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw (void) +TAO_Object_Adapter::wait_for_non_servant_upcalls_to_complete_no_throw () { // Non-exception throwing version. try diff --git a/TAO/tao/PortableServer/Object_Adapter.h b/TAO/tao/PortableServer/Object_Adapter.h index d4d30ebd322..62415aefec9 100644 --- a/TAO/tao/PortableServer/Object_Adapter.h +++ b/TAO/tao/PortableServer/Object_Adapter.h @@ -85,7 +85,7 @@ public: TAO_ORB_Core &orb_core); /// Destructor. - ~TAO_Object_Adapter (void); + ~TAO_Object_Adapter (); int dispatch_servant (const TAO::ObjectKey &key, TAO_ServerRequest &req, @@ -113,31 +113,31 @@ public: int activate_poa (const poa_name &folded_name, TAO_Root_POA *&poa); - ACE_Lock &lock (void); + ACE_Lock &lock (); - TAO_SYNCH_MUTEX &thread_lock (void); + TAO_SYNCH_MUTEX &thread_lock (); - ACE_Reverse_Lock<ACE_Lock> &reverse_lock (void); + ACE_Reverse_Lock<ACE_Lock> &reverse_lock (); /// Access the root poa. - TAO_Root_POA *root_poa (void) const; + TAO_Root_POA *root_poa () const; /// Access to ORB Core. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// Wait for non-servant upcalls to complete. - void wait_for_non_servant_upcalls_to_complete (void); + void wait_for_non_servant_upcalls_to_complete (); /// Non-exception throwing version. - void wait_for_non_servant_upcalls_to_complete_no_throw (void); + void wait_for_non_servant_upcalls_to_complete_no_throw (); - static CORBA::ULong transient_poa_name_size (void); + static CORBA::ULong transient_poa_name_size (); /// Return the validator. - TAO_Policy_Validator &validator (void); + TAO_Policy_Validator &validator (); /// Return the set of default policies. - TAO_POA_Policy_Set &default_poa_policies (void); + TAO_POA_Policy_Set &default_poa_policies (); /// Set the servant dispatcher method. Ownership is transferred to /// this Object Adapter. Note: This should only be called @@ -149,15 +149,15 @@ public: // = The TAO_Adapter methods, please check tao/Adapter.h for the // documentation - virtual void open (void); + virtual void open (); virtual void close (int wait_for_completion); virtual void check_close (int wait_for_completion); - virtual int priority (void) const; + virtual int priority () const; virtual int dispatch (TAO::ObjectKey &key, TAO_ServerRequest &request, CORBA::Object_out forward_to); - virtual const char *name (void) const; - virtual CORBA::Object_ptr root (void); + virtual const char *name () const; + virtual CORBA::Object_ptr root (); virtual CORBA::Object_ptr create_collocated_object (TAO_Stub *, const TAO_MProfile &); @@ -215,7 +215,7 @@ public: { public: - virtual ~Hint_Strategy (void); + virtual ~Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa) = 0; @@ -249,7 +249,7 @@ public: Active_Hint_Strategy (CORBA::ULong map_size); - virtual ~Active_Hint_Strategy (void); + virtual ~Active_Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa); @@ -286,7 +286,7 @@ public: { public: - virtual ~No_Hint_Strategy (void); + virtual ~No_Hint_Strategy (); virtual int find_persistent_poa (const poa_name &system_name, TAO_Root_POA *&poa); @@ -403,7 +403,7 @@ public: ACE_CString operator* () const; /// Prefix advance. - poa_name_iterator &operator++ (void); + poa_name_iterator &operator++ (); protected: @@ -426,8 +426,8 @@ public: iteratable_poa_name (const poa_name &folded_name); - iterator begin (void) const; - iterator end (void) const; + iterator begin () const; + iterator end () const; protected: @@ -442,7 +442,7 @@ public: /// Pointer to the non-servant upcall in progress. If no non-servant /// upcall is in progress, this pointer is zero. - TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress (void) const; + TAO::Portable_Server::Non_Servant_Upcall *non_servant_upcall_in_progress () const; private: diff --git a/TAO/tao/PortableServer/Object_SArgument_T.h b/TAO/tao/PortableServer/Object_SArgument_T.h index cad8ead9956..56563f63655 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.h +++ b/TAO/tao/PortableServer/Object_SArgument_T.h @@ -46,7 +46,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr arg (void) const; + S_ptr arg () const; private: S_var x_; @@ -64,14 +64,14 @@ namespace TAO class Inout_Object_SArgument_T : public InoutArgument { public: - Inout_Object_SArgument_T (void); + Inout_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); private: S_var x_; @@ -90,13 +90,13 @@ namespace TAO class Out_Object_SArgument_T : public OutArgument { public: - Out_Object_SArgument_T (void); + Out_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_out arg (void); + S_out arg (); private: S_var x_; @@ -114,13 +114,13 @@ namespace TAO class Ret_Object_SArgument_T : public RetArgument { public: - Ret_Object_SArgument_T (void); + Ret_Object_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S_ptr & arg (void); + S_ptr & arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Operation_Table.cpp b/TAO/tao/PortableServer/Operation_Table.cpp index 51d1022d3cb..1caafb83961 100644 --- a/TAO/tao/PortableServer/Operation_Table.cpp +++ b/TAO/tao/PortableServer/Operation_Table.cpp @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Operation_Table::~TAO_Operation_Table (void) +TAO_Operation_Table::~TAO_Operation_Table () { } /**************************************************************/ -TAO::Operation_Skeletons::Operation_Skeletons (void) +TAO::Operation_Skeletons::Operation_Skeletons () : skel_ptr (0) , thruPOA_skel_ptr (0) , direct_skel_ptr (0) diff --git a/TAO/tao/PortableServer/Operation_Table.h b/TAO/tao/PortableServer/Operation_Table.h index bd3e39f380d..11d78518daa 100644 --- a/TAO/tao/PortableServer/Operation_Table.h +++ b/TAO/tao/PortableServer/Operation_Table.h @@ -79,7 +79,7 @@ namespace TAO */ struct TAO_PortableServer_Export Operation_Skeletons { - Operation_Skeletons (void); + Operation_Skeletons (); /// Remote skeleton pointer TAO_Skeleton skel_ptr; @@ -123,7 +123,7 @@ public: virtual int bind (const char *opname, const TAO::Operation_Skeletons skel_ptr) = 0; - virtual ~TAO_Operation_Table (void); + virtual ~TAO_Operation_Table (); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp index bff7610bab2..a36d050310a 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.cpp @@ -26,7 +26,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable (void) +TAO_Binary_Search_OpTable::~TAO_Binary_Search_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h index 87c23bce8ea..fa04e2fd156 100644 --- a/TAO/tao/PortableServer/Operation_Table_Binary_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Binary_Search.h @@ -40,7 +40,7 @@ class TAO_PortableServer_Export TAO_Binary_Search_OpTable public: /// Do nothing destructor. - virtual ~TAO_Binary_Search_OpTable (void); + virtual ~TAO_Binary_Search_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp index 5f8f5eda365..95e5d4d8ba3 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.cpp @@ -50,7 +50,7 @@ TAO_Dynamic_Hash_OpTable::TAO_Dynamic_Hash_OpTable ( } } -TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable (void) +TAO_Dynamic_Hash_OpTable::~TAO_Dynamic_Hash_OpTable () { // Initialize an iterator. We need to go thru each entry and free // up storage allocated to hold the external ids. In this case, diff --git a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h index 611950d5a64..c2c421691f2 100644 --- a/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Dynamic_Hash.h @@ -49,7 +49,7 @@ public: ACE_Allocator *alloc); /// Destructor - ~TAO_Dynamic_Hash_OpTable (void); + ~TAO_Dynamic_Hash_OpTable (); /// See the documentation in the base class for details. virtual int bind (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp index 58505e0f0ca..4baed2dea0a 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.cpp @@ -27,7 +27,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable (void) +TAO_Linear_Search_OpTable::~TAO_Linear_Search_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h index 380a76e7503..4fa853eca8b 100644 --- a/TAO/tao/PortableServer/Operation_Table_Linear_Search.h +++ b/TAO/tao/PortableServer/Operation_Table_Linear_Search.h @@ -34,7 +34,7 @@ class TAO_PortableServer_Export TAO_Linear_Search_OpTable { public: /// Destructor. - ~TAO_Linear_Search_OpTable (void); + ~TAO_Linear_Search_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp index 37f9429bb4d..3156673cb9b 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.cpp @@ -26,7 +26,7 @@ ACE_TIMEPROBE_EVENT_DESCRIPTIONS (TAO_Operation_Table_Timeprobe_Description, TAO_BEGIN_VERSIONED_NAMESPACE_DECL // Do nothing destructor. -TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable (void) +TAO_Perfect_Hash_OpTable::~TAO_Perfect_Hash_OpTable () { } diff --git a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h index 5365cd0aebf..b89d8f511ea 100644 --- a/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h +++ b/TAO/tao/PortableServer/Operation_Table_Perfect_Hash.h @@ -41,7 +41,7 @@ class TAO_PortableServer_Export TAO_Perfect_Hash_OpTable public: /// Do nothing destructor. - virtual ~TAO_Perfect_Hash_OpTable (void); + virtual ~TAO_Perfect_Hash_OpTable (); /// See the documentation in the base class for details. virtual int find (const char *opname, diff --git a/TAO/tao/PortableServer/POAManager.cpp b/TAO/tao/PortableServer/POAManager.cpp index d3c8c4c30a9..f1cdd220590 100644 --- a/TAO/tao/PortableServer/POAManager.cpp +++ b/TAO/tao/PortableServer/POAManager.cpp @@ -39,7 +39,7 @@ TAO_POA_Manager::TAO_POA_Manager ( #endif -TAO_POA_Manager::~TAO_POA_Manager (void) +TAO_POA_Manager::~TAO_POA_Manager () { #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) poa_manager_factory_._remove_ref (); @@ -47,13 +47,13 @@ TAO_POA_Manager::~TAO_POA_Manager (void) } char * -TAO_POA_Manager::get_id (void) +TAO_POA_Manager::get_id () { return CORBA::string_dup (this->id_.in ()); } void -TAO_POA_Manager::activate_i (void) +TAO_POA_Manager::activate_i () { // This operation changes the state of the POA manager to active. If // issued while the POA manager is in the inactive state, the @@ -301,7 +301,7 @@ TAO_POA_Manager::register_poa (TAO_Root_POA *poa) } void -TAO_POA_Manager::check_state (void) +TAO_POA_Manager::check_state () { if (state_ == PortableServer::POAManager::ACTIVE) { @@ -367,7 +367,7 @@ TAO_POA_Manager::check_state (void) } CORBA::ORB_ptr -TAO_POA_Manager::_get_orb (void) +TAO_POA_Manager::_get_orb () { return CORBA::ORB::_duplicate (this->object_adapter_.orb_core ().orb ()); } diff --git a/TAO/tao/PortableServer/POAManager.h b/TAO/tao/PortableServer/POAManager.h index 1cba969df80..a589b63c4d0 100644 --- a/TAO/tao/PortableServer/POAManager.h +++ b/TAO/tao/PortableServer/POAManager.h @@ -59,7 +59,7 @@ class TAO_PortableServer_Export TAO_POA_Manager : friend class TAO_Object_Adapter; public: - void activate (void); + void activate (); #if (TAO_HAS_MINIMUM_POA == 0) @@ -72,9 +72,9 @@ public: #endif /* TAO_HAS_MINIMUM_POA == 0 */ - PortableServer::POAManager::State get_state (void); + PortableServer::POAManager::State get_state (); - char *get_id (void); + char *get_id (); TAO_POA_Manager (TAO_Object_Adapter &object_adapter, #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) @@ -85,21 +85,21 @@ public: const char * id); #endif - ~TAO_POA_Manager (void); + ~TAO_POA_Manager (); /// Check the state of this POA manager - void check_state (void); + void check_state (); PortableServer::POAManager::State get_state_i (); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - CORBA::PolicyList& get_policies (void); + CORBA::PolicyList& get_policies (); #endif protected: - void activate_i (void); + void activate_i (); void deactivate_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion); @@ -116,7 +116,7 @@ protected: #endif /* TAO_HAS_MINIMUM_POA == 0 */ - ACE_Lock &lock (void); + ACE_Lock &lock (); int remove_poa (TAO_Root_POA *poa); @@ -147,7 +147,7 @@ private : * given process. * @note: The id_ has the ownership of the memory allocated in this method. */ - char* generate_manager_id (void) const; + char* generate_manager_id () const; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/PortableServer/POAManagerFactory.cpp b/TAO/tao/PortableServer/POAManagerFactory.cpp index bc1b2cb69c7..afd7c87df6a 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.cpp +++ b/TAO/tao/PortableServer/POAManagerFactory.cpp @@ -14,7 +14,7 @@ TAO_POAManager_Factory::TAO_POAManager_Factory (TAO_Object_Adapter &object_adapt { } -TAO_POAManager_Factory::~TAO_POAManager_Factory (void) +TAO_POAManager_Factory::~TAO_POAManager_Factory () { this->remove_all_poamanagers (); } @@ -74,7 +74,7 @@ TAO_POAManager_Factory::create_POAManager ( } ::PortableServer::POAManagerFactory::POAManagerSeq * -TAO_POAManager_Factory::list (void) +TAO_POAManager_Factory::list () { ::PortableServer::POAManagerFactory::POAManagerSeq_var poamanagers; CORBA::ULong number_of_poamanagers = static_cast <CORBA::ULong> @@ -122,7 +122,7 @@ TAO_POAManager_Factory::find (const char * id) } void -TAO_POAManager_Factory::remove_all_poamanagers (void) +TAO_POAManager_Factory::remove_all_poamanagers () { for (POAMANAGERSET::iterator iterator = this->poamanager_set_.begin (); iterator != this->poamanager_set_.end (); diff --git a/TAO/tao/PortableServer/POAManagerFactory.h b/TAO/tao/PortableServer/POAManagerFactory.h index 6335b0838dc..319fffaef87 100644 --- a/TAO/tao/PortableServer/POAManagerFactory.h +++ b/TAO/tao/PortableServer/POAManagerFactory.h @@ -43,17 +43,17 @@ class TAO_PortableServer_Export TAO_POAManager_Factory : public: TAO_POAManager_Factory (TAO_Object_Adapter &object_adapter); - virtual ~TAO_POAManager_Factory (void); + virtual ~TAO_POAManager_Factory (); virtual ::PortableServer::POAManager_ptr create_POAManager ( const char * id, const ::CORBA::PolicyList & policies); - virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (void); + virtual ::PortableServer::POAManagerFactory::POAManagerSeq * list (); virtual ::PortableServer::POAManager_ptr find (const char * id); - void remove_all_poamanagers (void); + void remove_all_poamanagers (); int remove_poamanager (::PortableServer::POAManager_ptr poamanager); diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.cpp b/TAO/tao/PortableServer/POA_Cached_Policies.cpp index 24061bd8238..9660fdfede2 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.cpp +++ b/TAO/tao/PortableServer/POA_Cached_Policies.cpp @@ -35,7 +35,7 @@ namespace TAO } - Cached_Policies::~Cached_Policies (void) + Cached_Policies::~Cached_Policies () { } diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.h b/TAO/tao/PortableServer/POA_Cached_Policies.h index af484d586d1..491b9833d83 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.h +++ b/TAO/tao/PortableServer/POA_Cached_Policies.h @@ -57,7 +57,7 @@ namespace TAO Cached_Policies (); - ~Cached_Policies (void); + ~Cached_Policies (); /// Update the cached policy values. void update (TAO_POA_Policy_Set &policy_set); @@ -66,30 +66,30 @@ namespace TAO * @name Accessor methods to cached values. */ //@{ - ::PortableServer::ThreadPolicyValue thread (void) const; - ::PortableServer::LifespanPolicyValue lifespan (void) const; - ::PortableServer::IdUniquenessPolicyValue id_uniqueness (void) const; - ::PortableServer::IdAssignmentPolicyValue id_assignment (void) const; - ::PortableServer::ImplicitActivationPolicyValue implicit_activation (void) const; - ::PortableServer::ServantRetentionPolicyValue servant_retention (void) const; - ::PortableServer::RequestProcessingPolicyValue request_processing (void) const; - PriorityModel priority_model (void) const; - CORBA::Short server_priority (void) const; + ::PortableServer::ThreadPolicyValue thread () const; + ::PortableServer::LifespanPolicyValue lifespan () const; + ::PortableServer::IdUniquenessPolicyValue id_uniqueness () const; + ::PortableServer::IdAssignmentPolicyValue id_assignment () const; + ::PortableServer::ImplicitActivationPolicyValue implicit_activation () const; + ::PortableServer::ServantRetentionPolicyValue servant_retention () const; + ::PortableServer::RequestProcessingPolicyValue request_processing () const; + PriorityModel priority_model () const; + CORBA::Short server_priority () const; /// Returns the network priority model that was set using a policy /// by the server application. /// - NetworkPriorityModel network_priority_model (void) const; + NetworkPriorityModel network_priority_model () const; /// Returns the request DiffServ codepoint that was set using a policy /// by the server application. /// - CORBA::Long request_diffserv_codepoint (void) const; + CORBA::Long request_diffserv_codepoint () const; /// Returns the reply DiffServ codepoint that was set using a policy /// by the server application. /// - CORBA::Long reply_diffserv_codepoint (void) const; + CORBA::Long reply_diffserv_codepoint () const; /// Caches the network priority model that was set using a policy /// by the server application. diff --git a/TAO/tao/PortableServer/POA_Cached_Policies.inl b/TAO/tao/PortableServer/POA_Cached_Policies.inl index 4c42ccef173..efa253591b3 100644 --- a/TAO/tao/PortableServer/POA_Cached_Policies.inl +++ b/TAO/tao/PortableServer/POA_Cached_Policies.inl @@ -6,55 +6,55 @@ namespace TAO namespace Portable_Server { ACE_INLINE ::PortableServer::ThreadPolicyValue - Cached_Policies::thread (void) const + Cached_Policies::thread () const { return this->thread_; } ACE_INLINE ::PortableServer::LifespanPolicyValue - Cached_Policies::lifespan (void) const + Cached_Policies::lifespan () const { return this->lifespan_; } ACE_INLINE ::PortableServer::IdUniquenessPolicyValue - Cached_Policies::id_uniqueness (void) const + Cached_Policies::id_uniqueness () const { return this->id_uniqueness_; } ACE_INLINE ::PortableServer::IdAssignmentPolicyValue - Cached_Policies::id_assignment (void) const + Cached_Policies::id_assignment () const { return this->id_assignment_; } ACE_INLINE ::PortableServer::ImplicitActivationPolicyValue - Cached_Policies::implicit_activation (void) const + Cached_Policies::implicit_activation () const { return this->implicit_activation_; } ACE_INLINE ::PortableServer::ServantRetentionPolicyValue - Cached_Policies::servant_retention (void) const + Cached_Policies::servant_retention () const { return this->servant_retention_; } ACE_INLINE ::PortableServer::RequestProcessingPolicyValue - Cached_Policies::request_processing (void) const + Cached_Policies::request_processing () const { return this->request_processing_; } ACE_INLINE Cached_Policies::PriorityModel - Cached_Policies::priority_model (void) const + Cached_Policies::priority_model () const { return this->priority_model_; } ACE_INLINE CORBA::Short - Cached_Policies::server_priority (void) const + Cached_Policies::server_priority () const { return this->server_priority_; } @@ -72,19 +72,19 @@ namespace TAO } ACE_INLINE Cached_Policies::NetworkPriorityModel - Cached_Policies::network_priority_model (void) const + Cached_Policies::network_priority_model () const { return this->network_priority_model_; } ACE_INLINE CORBA::Long - Cached_Policies::request_diffserv_codepoint (void) const + Cached_Policies::request_diffserv_codepoint () const { return this->request_diffserv_codepoint_; } ACE_INLINE CORBA::Long - Cached_Policies::reply_diffserv_codepoint (void) const + Cached_Policies::reply_diffserv_codepoint () const { return this->reply_diffserv_codepoint_; } diff --git a/TAO/tao/PortableServer/POA_Current.cpp b/TAO/tao/PortableServer/POA_Current.cpp index 506f938fb96..cdb6a81c23c 100644 --- a/TAO/tao/PortableServer/POA_Current.cpp +++ b/TAO/tao/PortableServer/POA_Current.cpp @@ -13,7 +13,7 @@ namespace TAO namespace Portable_Server { PortableServer::POA_ptr - POA_Current::get_POA (void) + POA_Current::get_POA () { POA_Current_Impl *impl = this->implementation (); @@ -23,7 +23,7 @@ namespace TAO } PortableServer::ObjectId * - POA_Current::get_object_id (void) + POA_Current::get_object_id () { POA_Current_Impl *impl = this->implementation (); @@ -33,7 +33,7 @@ namespace TAO } PortableServer::Servant - POA_Current::get_servant (void) + POA_Current::get_servant () { POA_Current_Impl *impl = this->implementation (); @@ -43,7 +43,7 @@ namespace TAO } CORBA::Object_ptr - POA_Current::get_reference (void) + POA_Current::get_reference () { POA_Current_Impl *impl = this->implementation (); @@ -53,7 +53,7 @@ namespace TAO } POA_Current_Impl * - POA_Current::implementation (void) + POA_Current::implementation () { return static_cast <POA_Current_Impl *> (TAO_TSS_Resources::instance ()->poa_current_impl_); diff --git a/TAO/tao/PortableServer/POA_Current.h b/TAO/tao/PortableServer/POA_Current.h index e90680b9141..3c014c7ece7 100644 --- a/TAO/tao/PortableServer/POA_Current.h +++ b/TAO/tao/PortableServer/POA_Current.h @@ -45,14 +45,14 @@ namespace TAO * Can raise the @c NoContext exception if this function is * not invoked in the context of an upcall. */ - PortableServer::POA_ptr get_POA (void); + PortableServer::POA_ptr get_POA (); /** * Returns the object id of the current request being invoked. Can * raise the @c NoContext exception if this function is not * invoked in the context of an upcall. */ - PortableServer::ObjectId *get_object_id (void); + PortableServer::ObjectId *get_object_id (); /** * This operation returns a locally manufactured reference to the object @@ -63,17 +63,17 @@ namespace TAO * Object::is_equivalent operation to compare the two references may not * necessarily return true. */ - CORBA::Object_ptr get_reference (void); + CORBA::Object_ptr get_reference (); /** * Returns a reference to the servant that hosts the object in whose * context it is called. If called outside the context of the POA * dispatched operation, a NoContext exception is raised */ - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); /// Returns the class that implements this interface. - POA_Current_Impl *implementation (void); + POA_Current_Impl *implementation (); /// Sets the thread-specific pointer to the new POA Current state, /// returning a pointer to the existing POA Current state. diff --git a/TAO/tao/PortableServer/POA_Current_Impl.cpp b/TAO/tao/PortableServer/POA_Current_Impl.cpp index a3d4e509474..22c8c91e7a6 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.cpp +++ b/TAO/tao/PortableServer/POA_Current_Impl.cpp @@ -15,7 +15,7 @@ namespace TAO { namespace Portable_Server { - POA_Current_Impl::POA_Current_Impl (void) + POA_Current_Impl::POA_Current_Impl () : poa_ (0), object_id_ (TAO_POA_OBJECT_ID_BUF_SIZE, 0, object_id_buf_), object_key_ (0), @@ -46,13 +46,13 @@ namespace TAO } POA_Current_Impl * - POA_Current_Impl::previous (void) const + POA_Current_Impl::previous () const { return this->previous_current_impl_; } void - POA_Current_Impl::teardown (void) + POA_Current_Impl::teardown () { if (this->setup_done_) { @@ -62,13 +62,13 @@ namespace TAO } PortableServer::POA_ptr - POA_Current_Impl::get_POA (void) + POA_Current_Impl::get_POA () { return PortableServer::POA::_duplicate (this->poa_); } PortableServer::ObjectId * - POA_Current_Impl::get_object_id (void) + POA_Current_Impl::get_object_id () { PortableServer::ObjectId *objid = 0; @@ -80,19 +80,19 @@ namespace TAO } CORBA::Object_ptr - POA_Current_Impl::get_reference (void) + POA_Current_Impl::get_reference () { return this->poa_->id_to_reference (this->object_id_); } PortableServer::Servant - POA_Current_Impl::get_servant (void) + POA_Current_Impl::get_servant () { return this->servant_; } TAO_ORB_Core & - POA_Current_Impl::orb_core (void) const + POA_Current_Impl::orb_core () const { return this->poa_->orb_core (); diff --git a/TAO/tao/PortableServer/POA_Current_Impl.h b/TAO/tao/PortableServer/POA_Current_Impl.h index deebafdfd71..46fd6c8b9dd 100644 --- a/TAO/tao/PortableServer/POA_Current_Impl.h +++ b/TAO/tao/PortableServer/POA_Current_Impl.h @@ -68,41 +68,41 @@ namespace TAO /// Return pointer to the invoking POA. Raises the /// CORBA::NoContext exception. - PortableServer::POA_ptr get_POA (void); + PortableServer::POA_ptr get_POA (); /** * Return pointer to the object id through which this was invoked. * This may be necessary in cases where a <Servant> is serving under * the guise of multiple object ids. */ - PortableServer::ObjectId *get_object_id (void); + PortableServer::ObjectId *get_object_id (); /** * Returns a reference to the servant that hosts the object in whose * context it is called. */ - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); /** * This operation returns a locally manufactured reference to the object * in the context of which it is called. */ - CORBA::Object_ptr get_reference (void); + CORBA::Object_ptr get_reference (); /// Set the POA implementation. void poa (::TAO_Root_POA *); /// Get the POA implemantation - ::TAO_Root_POA *poa (void) const; + ::TAO_Root_POA *poa () const; /// ORB Core for this current. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// Set the object ID. void object_id (const PortableServer::ObjectId &id); /// Get the object ID. - const PortableServer::ObjectId &object_id (void) const; + const PortableServer::ObjectId &object_id () const; /// Just replace the object id smartly void replace_object_id (const PortableServer::ObjectId &system_id); @@ -111,28 +111,28 @@ namespace TAO void object_key (const TAO::ObjectKey &key); /// Get the object key. - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Set the servant for the current upcall. void servant (PortableServer::Servant servant); /// Get the servant for the current upcall. - PortableServer::Servant servant (void) const; + PortableServer::Servant servant () const; /// Set the priority for the current upcall. void priority (CORBA::Short priority); /// Get the priority for the current upcall. - CORBA::Short priority (void) const; + CORBA::Short priority () const; /// Convenience constructor combining construction & initialization. - POA_Current_Impl (void); + POA_Current_Impl (); /// Return the previous current implementation. - POA_Current_Impl *previous (void) const; + POA_Current_Impl *previous () const; /// Teardown the current for this request. - void teardown (void); + void teardown (); /// Setup the current. void setup (::TAO_Root_POA *impl, const TAO::ObjectKey &key); diff --git a/TAO/tao/PortableServer/POA_Policy_Set.cpp b/TAO/tao/PortableServer/POA_Policy_Set.cpp index 9b0df5c9089..8f155ed5ebc 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.cpp +++ b/TAO/tao/PortableServer/POA_Policy_Set.cpp @@ -11,7 +11,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_POA_Policy_Set::TAO_POA_Policy_Set (void) +TAO_POA_Policy_Set::TAO_POA_Policy_Set () : impl_ (TAO_POLICY_POA_SCOPE) { } @@ -22,7 +22,7 @@ TAO_POA_Policy_Set::TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs) { } -TAO_POA_Policy_Set::~TAO_POA_Policy_Set (void) +TAO_POA_Policy_Set::~TAO_POA_Policy_Set () { } diff --git a/TAO/tao/PortableServer/POA_Policy_Set.h b/TAO/tao/PortableServer/POA_Policy_Set.h index 373a3b9f1a8..8cc73b11ebe 100644 --- a/TAO/tao/PortableServer/POA_Policy_Set.h +++ b/TAO/tao/PortableServer/POA_Policy_Set.h @@ -29,18 +29,18 @@ class TAO_Policy_Validator; class TAO_PortableServer_Export TAO_POA_Policy_Set { public: - TAO_POA_Policy_Set (void); + TAO_POA_Policy_Set (); TAO_POA_Policy_Set (const TAO_POA_Policy_Set &rhs); - ~TAO_POA_Policy_Set (void); + ~TAO_POA_Policy_Set (); /// Returns the policy at the specified index. /// CORBA::Policy::_nil () is returned if the policy doesn't exist CORBA::Policy *get_policy_by_index (CORBA::ULong index); /// Get the number of policies - CORBA::ULong num_policies (void) const; + CORBA::ULong num_policies () const; /// Obtain a single cached policy. CORBA::Policy_ptr get_cached_policy (TAO_Cached_Policy_Type type); @@ -55,7 +55,7 @@ public: /// Add all of the client exposed policies to the specified list. void add_client_exposed_fixed_policies (CORBA::PolicyList *client_exposed_policies); - TAO_Policy_Set &policies (void); + TAO_Policy_Set &policies (); /// Obtain a single policy. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); diff --git a/TAO/tao/PortableServer/Policy_Strategy.h b/TAO/tao/PortableServer/Policy_Strategy.h index ec0a774404f..1acd9e71912 100644 --- a/TAO/tao/PortableServer/Policy_Strategy.h +++ b/TAO/tao/PortableServer/Policy_Strategy.h @@ -34,9 +34,9 @@ namespace TAO public: virtual void strategy_init(TAO_Root_POA *poa) = 0; - virtual void strategy_cleanup(void) = 0; + virtual void strategy_cleanup() = 0; - virtual ~Policy_Strategy (void) {}; + virtual ~Policy_Strategy () {}; }; } } diff --git a/TAO/tao/PortableServer/PortableServer.cpp b/TAO/tao/PortableServer/PortableServer.cpp index dc55e7b8e14..42268bcdfec 100644 --- a/TAO/tao/PortableServer/PortableServer.cpp +++ b/TAO/tao/PortableServer/PortableServer.cpp @@ -44,7 +44,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL int -TAO_POA_Initializer::init (void) +TAO_POA_Initializer::init () { ACE_Service_Config::process_directive ( ace_svc_desc_IdAssignmentStrategySystem); diff --git a/TAO/tao/PortableServer/PortableServer.h b/TAO/tao/PortableServer/PortableServer.h index 6e9d1bd5d98..e236d7c607e 100644 --- a/TAO/tao/PortableServer/PortableServer.h +++ b/TAO/tao/PortableServer/PortableServer.h @@ -27,7 +27,7 @@ class TAO_PortableServer_Export TAO_POA_Initializer { public: /// Used to force the initialization of the ORB code. - static int init (void); + static int init (); }; static const int TAO_Requires_POA_Initializer = TAO_POA_Initializer::init (); diff --git a/TAO/tao/PortableServer/Regular_POA.cpp b/TAO/tao/PortableServer/Regular_POA.cpp index fad1bcc1272..d95abb8b3ca 100644 --- a/TAO/tao/PortableServer/Regular_POA.cpp +++ b/TAO/tao/PortableServer/Regular_POA.cpp @@ -30,12 +30,12 @@ TAO_Regular_POA::TAO_Regular_POA (const TAO_Root_POA::String &name, { } -TAO_Regular_POA::~TAO_Regular_POA (void) +TAO_Regular_POA::~TAO_Regular_POA () { } void -TAO_Regular_POA::remove_from_parent_i (void) +TAO_Regular_POA::remove_from_parent_i () { // Remove POA from the parent if (this->parent_ != 0) @@ -49,13 +49,13 @@ TAO_Regular_POA::remove_from_parent_i (void) } CORBA::Boolean -TAO_Regular_POA::root (void) const +TAO_Regular_POA::root () const { return (parent_ == 0); } char -TAO_Regular_POA::root_key_type (void) +TAO_Regular_POA::root_key_type () { if (this->parent_ != 0) { diff --git a/TAO/tao/PortableServer/Regular_POA.h b/TAO/tao/PortableServer/Regular_POA.h index 3ba38c4130e..9da69970431 100644 --- a/TAO/tao/PortableServer/Regular_POA.h +++ b/TAO/tao/PortableServer/Regular_POA.h @@ -47,16 +47,16 @@ public: TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter); - virtual ~TAO_Regular_POA (void); + virtual ~TAO_Regular_POA (); - PortableServer::POA_ptr the_parent (void); + PortableServer::POA_ptr the_parent (); protected: - virtual void remove_from_parent_i (void); + virtual void remove_from_parent_i (); - virtual CORBA::Boolean root (void) const; + virtual CORBA::Boolean root () const; - virtual char root_key_type (void); + virtual char root_key_type (); /// The parent of this POA, be aware that in case this pointer is nill, /// we are a parent. This can be achieved by deriving from this Regular_POA diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp index 8145883a4cc..a180a70a1c6 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.cpp @@ -19,7 +19,7 @@ namespace TAO } CORBA::Policy_ptr - RequestProcessingPolicy::copy (void) + RequestProcessingPolicy::copy () { RequestProcessingPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -30,30 +30,30 @@ namespace TAO } void - RequestProcessingPolicy::destroy (void) + RequestProcessingPolicy::destroy () { } ::PortableServer::RequestProcessingPolicyValue - RequestProcessingPolicy::value (void) + RequestProcessingPolicy::value () { return value_; } CORBA::PolicyType - RequestProcessingPolicy::policy_type (void) + RequestProcessingPolicy::policy_type () { return ::PortableServer::REQUEST_PROCESSING_POLICY_ID; } TAO_Cached_Policy_Type - RequestProcessingPolicy::_tao_cached_type (void) const + RequestProcessingPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_REQUEST_PROCESSING; } TAO_Policy_Scope - RequestProcessingPolicy::_tao_scope (void) const + RequestProcessingPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/RequestProcessingPolicy.h b/TAO/tao/PortableServer/RequestProcessingPolicy.h index a93afc63ece..3efefae3963 100644 --- a/TAO/tao/PortableServer/RequestProcessingPolicy.h +++ b/TAO/tao/PortableServer/RequestProcessingPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: RequestProcessingPolicy (::PortableServer::RequestProcessingPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::RequestProcessingPolicyValue value (void); + ::PortableServer::RequestProcessingPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - virtual TAO_Cached_Policy_Type _tao_cached_type (void) const; + virtual TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - virtual TAO_Policy_Scope _tao_scope (void) const; + virtual TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::RequestProcessingPolicyValue value_; diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp index 7cd378aa737..f564757c699 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.cpp @@ -14,7 +14,7 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategy::RequestProcessingStrategy (void) + RequestProcessingStrategy::RequestProcessingStrategy () : poa_ (0) { } @@ -35,7 +35,7 @@ namespace TAO } void - RequestProcessingStrategy::strategy_cleanup(void) + RequestProcessingStrategy::strategy_cleanup() { poa_ = 0; } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategy.h b/TAO/tao/PortableServer/RequestProcessingStrategy.h index 80613323d41..5378d1739a4 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategy.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategy.h @@ -48,7 +48,7 @@ namespace TAO : public Policy_Strategy { public: - RequestProcessingStrategy (void); + RequestProcessingStrategy (); virtual void strategy_init(TAO_Root_POA *poa); @@ -56,18 +56,18 @@ namespace TAO TAO_Root_POA *poa, ::PortableServer::ServantRetentionPolicyValue); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - virtual PortableServer::ServantManager_ptr get_servant_manager (void) = 0; + virtual PortableServer::ServantManager_ptr get_servant_manager () = 0; virtual void set_servant_manager ( PortableServer::ServantManager_ptr imgr) = 0; virtual void set_servant (PortableServer::Servant servant) = 0; - virtual PortableServer::Servant get_servant (void) = 0; + virtual PortableServer::Servant get_servant () = 0; #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp index 7827a2189b3..9a77833ffe3 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.cpp @@ -19,7 +19,7 @@ namespace TAO #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr - RequestProcessingStrategyAOMOnly::get_servant_manager (void) + RequestProcessingStrategyAOMOnly::get_servant_manager () { throw PortableServer::POA::WrongPolicy (); } @@ -39,7 +39,7 @@ namespace TAO } PortableServer::Servant - RequestProcessingStrategyAOMOnly::get_servant (void) + RequestProcessingStrategyAOMOnly::get_servant () { throw PortableServer::POA::WrongPolicy (); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h index 0ef178c71ce..28718985f5f 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyAOMOnly.h @@ -36,18 +36,18 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyAOMOnly (void); + RequestProcessingStrategyAOMOnly (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr - get_servant_manager (void); + get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); void set_servant (PortableServer::Servant servant); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp index 201a95b1eb2..b8661b7fd00 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.cpp @@ -18,19 +18,19 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant (void) + RequestProcessingStrategyDefaultServant::RequestProcessingStrategyDefaultServant () : default_servant_ (0) { } void - RequestProcessingStrategyDefaultServant::strategy_cleanup(void) + RequestProcessingStrategyDefaultServant::strategy_cleanup() { this->default_servant_ = 0; } PortableServer::ServantManager_ptr - RequestProcessingStrategyDefaultServant::get_servant_manager (void) + RequestProcessingStrategyDefaultServant::get_servant_manager () { throw PortableServer::POA::WrongPolicy (); } @@ -43,7 +43,7 @@ namespace TAO } PortableServer::Servant - RequestProcessingStrategyDefaultServant::get_servant (void) + RequestProcessingStrategyDefaultServant::get_servant () { // This operation returns the default servant associated with the // POA. diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h index 20ed35f5a4f..e0c9f62f970 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyDefaultServant.h @@ -37,15 +37,15 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyDefaultServant (void); + RequestProcessingStrategyDefaultServant (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp index 52082c26dd2..85cd906d642 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.cpp @@ -17,13 +17,13 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator (void) : + RequestProcessingStrategyServantActivator::RequestProcessingStrategyServantActivator () : etherealize_objects_ (true) { } void - RequestProcessingStrategyServantActivator::strategy_cleanup (void) + RequestProcessingStrategyServantActivator::strategy_cleanup () { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -36,7 +36,7 @@ namespace TAO } PortableServer::ServantManager_ptr - RequestProcessingStrategyServantActivator::get_servant_manager (void) + RequestProcessingStrategyServantActivator::get_servant_manager () { return PortableServer::ServantManager::_duplicate (this->servant_activator_.in ()); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h index 6ffe7776b8b..c7675ae80a0 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantActivator.h @@ -34,11 +34,11 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantActivator (void); + RequestProcessingStrategyServantActivator (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp index e83bd3afe65..01458939b75 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.cpp @@ -17,12 +17,12 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator (void) + RequestProcessingStrategyServantLocator::RequestProcessingStrategyServantLocator () { } void - RequestProcessingStrategyServantLocator::strategy_cleanup(void) + RequestProcessingStrategyServantLocator::strategy_cleanup() { { Non_Servant_Upcall non_servant_upcall (*this->poa_); @@ -35,7 +35,7 @@ namespace TAO } PortableServer::ServantManager_ptr - RequestProcessingStrategyServantLocator::get_servant_manager (void) + RequestProcessingStrategyServantLocator::get_servant_manager () { return PortableServer::ServantManager::_duplicate (this->servant_locator_.in ()); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h index f5306029f20..9cff43232f2 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantLocator.h @@ -34,11 +34,11 @@ namespace TAO : public RequestProcessingStrategyServantManager { public: - RequestProcessingStrategyServantLocator (void); + RequestProcessingStrategyServantLocator (); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp index 73981faf582..6454c9ff55b 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.cpp @@ -14,12 +14,12 @@ namespace TAO { namespace Portable_Server { - RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager (void) + RequestProcessingStrategyServantManager::RequestProcessingStrategyServantManager () { } PortableServer::Servant - RequestProcessingStrategyServantManager::get_servant (void) + RequestProcessingStrategyServantManager::get_servant () { throw PortableServer::POA::WrongPolicy (); } diff --git a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h index 8ef06661724..420d9441072 100644 --- a/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h +++ b/TAO/tao/PortableServer/RequestProcessingStrategyServantManager.h @@ -33,9 +33,9 @@ namespace TAO : public RequestProcessingStrategy { public: - RequestProcessingStrategyServantManager (void); + RequestProcessingStrategyServantManager (); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/Root_POA.cpp b/TAO/tao/PortableServer/Root_POA.cpp index 972d5057fbc..fa97cf8d535 100644 --- a/TAO/tao/PortableServer/Root_POA.cpp +++ b/TAO/tao/PortableServer/Root_POA.cpp @@ -318,13 +318,13 @@ TAO_Root_POA::TAO_Root_POA (const TAO_Root_POA::String &name, aps_cleanup_guard._retn (); } -TAO_Root_POA::~TAO_Root_POA (void) +TAO_Root_POA::~TAO_Root_POA () { this->poa_manager_._remove_ref(); } void -TAO_Root_POA::complete_destruction_i (void) +TAO_Root_POA::complete_destruction_i () { bool doing_complete_destruction = this->waiting_destruction_ != false; @@ -739,7 +739,7 @@ TAO_Root_POA::servant_to_reference (PortableServer::Servant servant) } PortableServer::POAList * -TAO_Root_POA::the_children (void) +TAO_Root_POA::the_children () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -793,7 +793,7 @@ TAO_Root_POA::destroy (CORBA::Boolean etherealize_objects, } void -TAO_Root_POA::remove_from_parent_i (void) +TAO_Root_POA::remove_from_parent_i () { // The root poa has no parent, so this is a noop } @@ -976,7 +976,7 @@ TAO_Root_POA::delete_child (const TAO_Root_POA::String &child) } PortableServer::POAList * -TAO_Root_POA::the_children_i (void) +TAO_Root_POA::the_children_i () { PortableServer::POAList_var children; CORBA::ULong child_current = static_cast <CORBA::ULong> @@ -1000,7 +1000,7 @@ TAO_Root_POA::the_children_i (void) } PortableInterceptor::AdapterName * -TAO_Root_POA::adapter_name_i (void) +TAO_Root_POA::adapter_name_i () { // The adapter name is the sequence of names starting from the // RootPOA to the one whose name is requested. The name of the @@ -1278,7 +1278,7 @@ TAO_Root_POA::deactivate_object_i (const PortableServer::ObjectId &id) } CORBA::Boolean -TAO_Root_POA::is_persistent (void) const +TAO_Root_POA::is_persistent () const { return active_policy_strategies_.lifespan_strategy()->is_persistent (); } @@ -1539,7 +1539,7 @@ TAO_Root_POA::id_to_reference_i (const PortableServer::ObjectId &id, } CORBA::OctetSeq * -TAO_Root_POA::id (void) +TAO_Root_POA::id () { CORBA::OctetSeq *id = 0; ACE_NEW_THROW_EX (id, @@ -1905,13 +1905,13 @@ TAO_Root_POA::parse_ir_object_key (const TAO::ObjectKey &object_key, } TAO_Object_Adapter & -TAO_Root_POA::object_adapter (void) +TAO_Root_POA::object_adapter () { return *this->object_adapter_; } CORBA::Object_ptr -TAO_Root_POA::invoke_key_to_object (void) +TAO_Root_POA::invoke_key_to_object () { PortableServer::ObjectId_var &system_id = *this->key_to_object_params_.system_id_; @@ -2045,7 +2045,7 @@ TAO_Root_POA::key_to_stub_i (const TAO::ObjectKey &key, } void -TAO_Root_POA::establish_components (void) +TAO_Root_POA::establish_components () { TAO_IORInterceptor_Adapter *ior_adapter = this->orb_core_.ior_interceptor_adapter (); @@ -2233,7 +2233,7 @@ TAO_Root_POA::find_servant_priority ( } TAO::ORT_Adapter * -TAO_Root_POA::ORT_adapter_i (void) +TAO_Root_POA::ORT_adapter_i () { if ((this->ort_adapter_factory_) && (this->ort_adapter_ == 0)) { @@ -2272,7 +2272,7 @@ TAO_Root_POA::ORT_adapter_i (void) #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::AdapterActivator_ptr -TAO_Root_POA::the_activator (void) +TAO_Root_POA::the_activator () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::AdapterActivator::_nil ()); @@ -2294,7 +2294,7 @@ TAO_Root_POA::the_activator (PortableServer::AdapterActivator_ptr adapter_activa #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::ServantManager_ptr -TAO_Root_POA::get_servant_manager (void) +TAO_Root_POA::get_servant_manager () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (PortableServer::ServantManager::_nil ()); @@ -2314,14 +2314,14 @@ TAO_Root_POA::set_servant_manager (PortableServer::ServantManager_ptr imgr) } PortableServer::Servant -TAO_Root_POA::get_servant_i (void) +TAO_Root_POA::get_servant_i () { return this->active_policy_strategies_.request_processing_strategy()-> get_servant (); } PortableServer::Servant -TAO_Root_POA::get_servant (void) +TAO_Root_POA::get_servant () { // Lock access for the duration of this transaction. TAO_POA_GUARD_RETURN (0); @@ -2374,7 +2374,7 @@ TAO_Root_POA::is_servant_activation_allowed (PortableServer::Servant servant, } bool -TAO_Root_POA::has_system_id (void) const +TAO_Root_POA::has_system_id () const { return this->active_policy_strategies_.id_assignment_strategy ()-> has_system_id (); @@ -2402,14 +2402,14 @@ TAO_Root_POA::servant_has_remaining_activations (PortableServer::Servant servant } bool -TAO_Root_POA::allow_implicit_activation (void) const +TAO_Root_POA::allow_implicit_activation () const { return this->active_policy_strategies_.implicit_activation_strategy ()-> allow_implicit_activation (); } bool -TAO_Root_POA::allow_multiple_activations (void) const +TAO_Root_POA::allow_multiple_activations () const { return this->active_policy_strategies_.id_uniqueness_strategy ()-> allow_multiple_activations (); @@ -2425,7 +2425,7 @@ TAO_Root_POA::post_invoke_servant_cleanup( } CORBA::Short -TAO_Root_POA::server_priority (void) const +TAO_Root_POA::server_priority () const { return this->cached_policies_.server_priority (); } @@ -2440,19 +2440,19 @@ TAO_Root_POA::is_servant_active ( } TAO::Portable_Server::Cached_Policies& -TAO_Root_POA::cached_policies (void) +TAO_Root_POA::cached_policies () { return this->cached_policies_; } TAO_Network_Priority_Hook* -TAO_Root_POA::network_priority_hook (void) +TAO_Root_POA::network_priority_hook () { return this->network_priority_hook_; } TAO::Portable_Server::Cached_Policies::PriorityModel -TAO_Root_POA::priority_model (void) const +TAO_Root_POA::priority_model () const { return cached_policies_.priority_model (); } @@ -2483,13 +2483,13 @@ TAO_Root_POA::validate_lifespan ( } CORBA::Boolean -TAO_Root_POA::root (void) const +TAO_Root_POA::root () const { return true; } TAO::ORT_Adapter * -TAO_Root_POA::ORT_adapter (void) +TAO_Root_POA::ORT_adapter () { if (this->ort_adapter_ != 0) return this->ort_adapter_; @@ -2507,7 +2507,7 @@ TAO_Root_POA::ORT_adapter (void) } CORBA::Policy * -TAO_Root_POA::server_protocol (void) +TAO_Root_POA::server_protocol () { return 0; } @@ -2529,7 +2529,7 @@ TAO_Root_POA::Key_To_Object_Params::set (PortableServer::ObjectId_var &system_id } CORBA::ULong -TAO_Root_POA::waiting_servant_deactivation (void) const +TAO_Root_POA::waiting_servant_deactivation () const { return this->active_policy_strategies_.servant_retention_strategy ()-> waiting_servant_deactivation (); @@ -2549,13 +2549,13 @@ TAO_Root_POA::get_policy (CORBA::PolicyType policy) } void -TAO_Root_POA::check_state (void) +TAO_Root_POA::check_state () { this->active_policy_strategies_.lifespan_strategy ()->check_state (); } const char * -TAO_Root_POA::ort_adapter_factory_name (void) +TAO_Root_POA::ort_adapter_factory_name () { return TAO_POA_Static_Resources::instance ()->ort_adapter_factory_name_.c_str(); } @@ -2567,27 +2567,27 @@ TAO_Root_POA::imr_client_adapter_name (const char *name) } const char * -TAO_Root_POA::imr_client_adapter_name (void) +TAO_Root_POA::imr_client_adapter_name () { return TAO_POA_Static_Resources::instance ()->imr_client_adapter_name_.c_str(); } PortableServer::POAManager_ptr -TAO_Root_POA::the_POAManager (void) +TAO_Root_POA::the_POAManager () { return PortableServer::POAManager::_duplicate (&this->poa_manager_); } #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) PortableServer::POAManagerFactory_ptr -TAO_Root_POA::the_POAManagerFactory (void) +TAO_Root_POA::the_POAManagerFactory () { return PortableServer::POAManagerFactory::_duplicate (&this->poa_manager_factory_); } #endif CORBA::ORB_ptr -TAO_Root_POA::_get_orb (void) +TAO_Root_POA::_get_orb () { return CORBA::ORB::_duplicate (this->orb_core_.orb ()); } @@ -2604,14 +2604,14 @@ TAO_POA_Static_Resources* TAO_POA_Static_Resources::initialization_reference_ = TAO_POA_Static_Resources::instance (); void -TAO_POA_Static_Resources::fini (void) +TAO_POA_Static_Resources::fini () { delete TAO_POA_Static_Resources::instance_; TAO_POA_Static_Resources::instance_ = 0; } TAO_POA_Static_Resources* -TAO_POA_Static_Resources::instance (void) +TAO_POA_Static_Resources::instance () { if (TAO_POA_Static_Resources::instance_ == 0) { @@ -2628,7 +2628,7 @@ TAO_POA_Static_Resources::instance (void) return TAO_POA_Static_Resources::instance_; } -TAO_POA_Static_Resources::TAO_POA_Static_Resources (void) +TAO_POA_Static_Resources::TAO_POA_Static_Resources () : ort_adapter_factory_name_ ("ORT_Adapter_Factory"), imr_client_adapter_name_ ("ImR_Client_Adapter") { diff --git a/TAO/tao/PortableServer/Root_POA.h b/TAO/tao/PortableServer/Root_POA.h index 5e1124ae33c..37521aad56c 100644 --- a/TAO/tao/PortableServer/Root_POA.h +++ b/TAO/tao/PortableServer/Root_POA.h @@ -176,22 +176,22 @@ public: #endif /* TAO_HAS_MINIMUM_POA == 0 && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ - char * the_name (void); + char * the_name (); - PortableServer::POA_ptr the_parent (void); + PortableServer::POA_ptr the_parent (); - PortableServer::POAList *the_children (void); + PortableServer::POAList *the_children (); - PortableServer::POAManager_ptr the_POAManager (void); + PortableServer::POAManager_ptr the_POAManager (); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::POAManagerFactory_ptr the_POAManagerFactory (void); + PortableServer::POAManagerFactory_ptr the_POAManagerFactory (); #endif /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name (void); + PortableInterceptor::AdapterName *adapter_name (); /// Store the given TaggedComponent for eventual insertion into all /// object reference profiles. @@ -204,15 +204,15 @@ public: IOP::ProfileId profile_id); #if (TAO_HAS_MINIMUM_POA == 0) && !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) - PortableServer::AdapterActivator_ptr the_activator (void); + PortableServer::AdapterActivator_ptr the_activator (); void the_activator (PortableServer::AdapterActivator_ptr adapter_activator); - PortableServer::ServantManager_ptr get_servant_manager (void); + PortableServer::ServantManager_ptr get_servant_manager (); void set_servant_manager (PortableServer::ServantManager_ptr imgr); - PortableServer::Servant get_servant (void); + PortableServer::Servant get_servant (); void set_servant (PortableServer::Servant servant); #endif /* TAO_HAS_MINIMUM_POA == 0 !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) */ @@ -246,10 +246,10 @@ public: CORBA::Object_ptr id_to_reference (const PortableServer::ObjectId &oid); - CORBA::OctetSeq *id (void); + CORBA::OctetSeq *id (); /// Accessor for POA policies. - TAO_POA_Policy_Set &policies (void); + TAO_POA_Policy_Set &policies (); /// Get the set policy of the given type. CORBA::Policy_ptr get_policy (CORBA::PolicyType policy); @@ -268,11 +268,11 @@ public: TAO_ORB_Core &orb_core, TAO_Object_Adapter *object_adapter); - virtual ~TAO_Root_POA (void); + virtual ~TAO_Root_POA (); - static char name_separator (void); + static char name_separator (); - static CORBA::ULong name_separator_length (void); + static CORBA::ULong name_separator_length (); enum { @@ -281,34 +281,34 @@ public: static CORBA::Octet const objectkey_prefix[TAO_OBJECTKEY_PREFIX_SIZE]; - const TAO_Object_Adapter::poa_name &folded_name (void) const; + const TAO_Object_Adapter::poa_name &folded_name () const; - const TAO_Object_Adapter::poa_name &system_name (void) const; + const TAO_Object_Adapter::poa_name &system_name () const; static void check_for_valid_wait_for_completions ( const TAO_ORB_Core &orb_core, CORBA::Boolean wait_for_completion); /// ORB Core for POA. - TAO_ORB_Core &orb_core (void) const; + TAO_ORB_Core &orb_core () const; /// obtain a reference to the cached_profiles - TAO::Portable_Server::Cached_Policies& cached_policies (void); + TAO::Portable_Server::Cached_Policies& cached_policies (); /// obtain a handle to the network priority hooks - TAO_Network_Priority_Hook* network_priority_hook (void); + TAO_Network_Priority_Hook* network_priority_hook (); - TAO::Portable_Server::Cached_Policies::PriorityModel priority_model (void) const; + TAO::Portable_Server::Cached_Policies::PriorityModel priority_model () const; - CORBA::Boolean cleanup_in_progress (void); + CORBA::Boolean cleanup_in_progress (); /// Calls protected static method used when POACurrent is not appropriate. static int parse_ir_object_key (const TAO::ObjectKey &object_key, PortableServer::ObjectId &user_id); - TAO_Object_Adapter &object_adapter (void); + TAO_Object_Adapter &object_adapter (); - ACE_Lock &lock (void); + ACE_Lock &lock (); /// Create the correct stub, properly initialized with the /// attributes and policies attached to the current POA. @@ -321,33 +321,33 @@ public: * The POA can be in one of HOLDING, ACTIVE, DISCARDING, INACTIVE * and NON_EXISTENT states. */ - PortableInterceptor::AdapterState get_adapter_state (void); + PortableInterceptor::AdapterState get_adapter_state (); - virtual void *thread_pool (void) const; + virtual void *thread_pool () const; - virtual CORBA::Policy *server_protocol (void); + virtual CORBA::Policy *server_protocol (); - CORBA::ULong outstanding_requests (void) const; + CORBA::ULong outstanding_requests () const; - const ACE_CString &name (void) const; + const ACE_CString &name () const; - CORBA::Boolean waiting_destruction (void) const; + CORBA::Boolean waiting_destruction () const; static void ort_adapter_factory_name (const char *name); - static const char *ort_adapter_factory_name (void); + static const char *ort_adapter_factory_name (); /// Sets the value of TAO_POA_Static_Resources::imr_client_adapter_name_. static void imr_client_adapter_name (const char *name); /// Gets the value of TAO_POA_Static_Resources::imr_client_adapter_name_. - static const char *imr_client_adapter_name (void); + static const char *imr_client_adapter_name (); - CORBA::Object_ptr invoke_key_to_object (void); + CORBA::Object_ptr invoke_key_to_object (); - CORBA::Boolean system_id (void); + CORBA::Boolean system_id (); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; /// Return the POA Manager related to this POA TAO_POA_Manager &tao_poa_manager (); @@ -373,9 +373,9 @@ public: CORBA::Boolean servant_has_remaining_activations ( PortableServer::Servant servant); - bool allow_implicit_activation (void) const; + bool allow_implicit_activation () const; - bool allow_multiple_activations (void) const; + bool allow_multiple_activations () const; int is_servant_active ( PortableServer::Servant servant, @@ -383,11 +383,11 @@ public: void deactivate_object_i (const PortableServer::ObjectId &oid); - CORBA::Boolean is_persistent (void) const; + CORBA::Boolean is_persistent () const; - CORBA::Short server_priority (void) const; + CORBA::Short server_priority () const; - bool has_system_id (void) const; + bool has_system_id () const; PortableServer::Servant find_servant (const PortableServer::ObjectId &system_id); @@ -436,18 +436,18 @@ public: PortableServer::ObjectId *servant_to_id_i (PortableServer::Servant servant); - TAO_SYNCH_CONDITION &servant_deactivation_condition (void); + TAO_SYNCH_CONDITION &servant_deactivation_condition (); int is_poa_generated_id (const PortableServer::ObjectId &id); /// Check the state of this POA - void check_state (void); + void check_state (); int delete_child (const String &child); PortableServer::Servant user_id_to_servant_i (const PortableServer::ObjectId &oid); - virtual CORBA::ORB_ptr _get_orb (void); + virtual CORBA::ORB_ptr _get_orb (); /// These hooks are needed by the CSD strategy to override /// and no-ops by default. @@ -469,9 +469,9 @@ public: protected: #if (TAO_HAS_MINIMUM_POA == 0) - int enter (void); + int enter (); - int exit (void); + int exit (); #endif /* TAO_HAS_MINIMUM_POA == 0 */ #if ! defined (CORBA_E_MICRO) @@ -501,14 +501,14 @@ protected: void destroy_i (CORBA::Boolean etherealize_objects, CORBA::Boolean wait_for_completion); - void complete_destruction_i (void); + void complete_destruction_i (); - PortableServer::POAList *the_children_i (void); + PortableServer::POAList *the_children_i (); /// This method returns the adapter_name as a sequence of strings of /// length one or more or just a fixed name depending on the Object /// Adapter. Added wrt to ORT Spec. - PortableInterceptor::AdapterName *adapter_name_i (void); + PortableInterceptor::AdapterName *adapter_name_i (); /// Method to notify the IOR Interceptors when there is a state /// changed not related to POAManager. @@ -546,7 +546,7 @@ protected: TAO_Acceptor_Filter *filter, TAO_Acceptor_Registry &acceptor_registry); - PortableServer::Servant get_servant_i (void); + PortableServer::Servant get_servant_i (); protected: void activate_object_with_id_i (const PortableServer::ObjectId &id, @@ -554,7 +554,7 @@ protected: CORBA::Short priority, bool &wait_occurred_restart_call); - virtual void remove_from_parent_i (void); + virtual void remove_from_parent_i (); void deactivate_all_objects_i (CORBA::Boolean etherealize_objects); @@ -585,7 +585,7 @@ protected: * IORInterceptor::components_established() once the former is * completed. */ - void establish_components (void); + void establish_components (); /// Call the IORInterceptor::components_established() method on all /// registered IORInterceptors. @@ -608,13 +608,13 @@ protected: protected: /// Accessor methods to ObjectReferenceTemplate PortableInterceptor::ObjectReferenceTemplate * - get_adapter_template (void); + get_adapter_template (); /// Accessor methods to ObjectReferenceTemplate, non locked version - PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (void); + PortableInterceptor::ObjectReferenceTemplate *get_adapter_template_i (); /// Accessor methods to PortableInterceptor::ObjectReferenceFactory - PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (void); + PortableInterceptor::ObjectReferenceFactory *get_obj_ref_factory (); /// Set the object reference factory void set_obj_ref_factory ( @@ -640,39 +640,39 @@ protected: /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one and hold the POA lock - TAO::ORT_Adapter *ORT_adapter (void); + TAO::ORT_Adapter *ORT_adapter (); /// Get the ORT adapter, in case there is no adapter yet, this method will /// try to create one but assumes the POA lock is already hold - TAO::ORT_Adapter *ORT_adapter_i (void); + TAO::ORT_Adapter *ORT_adapter_i (); - CORBA::Boolean persistent (void); + CORBA::Boolean persistent (); - static char persistent_key_char (void); + static char persistent_key_char (); - static char transient_key_char (void); + static char transient_key_char (); - static CORBA::ULong persistent_key_type_length (void); + static CORBA::ULong persistent_key_type_length (); - static char system_id_key_char (void); + static char system_id_key_char (); - static char user_id_key_char (void); + static char user_id_key_char (); - static CORBA::ULong system_id_key_type_length (void); + static CORBA::ULong system_id_key_type_length (); - virtual CORBA::Boolean root (void) const; + virtual CORBA::Boolean root () const; - virtual char root_key_type (void); + virtual char root_key_type (); - static char root_key_char (void); + static char root_key_char (); - static char non_root_key_char (void); + static char non_root_key_char (); - static CORBA::ULong root_key_type_length (void); + static CORBA::ULong root_key_type_length (); - CORBA::ULong increment_outstanding_requests (void); + CORBA::ULong increment_outstanding_requests (); - CORBA::ULong decrement_outstanding_requests (void); + CORBA::ULong decrement_outstanding_requests (); String name_; @@ -797,10 +797,10 @@ class TAO_PortableServer_Export TAO_POA_Static_Resources public: /// Return the singleton instance. - static TAO_POA_Static_Resources* instance (void); + static TAO_POA_Static_Resources* instance (); /// Cleanup the static singleton - static void fini (void) ACE_GCC_DESTRUCTOR_ATTRIBUTE; + static void fini () ACE_GCC_DESTRUCTOR_ATTRIBUTE; public: @@ -823,7 +823,7 @@ public: ACE_CString imr_client_adapter_name_; private: /// Constructor. - TAO_POA_Static_Resources (void); + TAO_POA_Static_Resources (); private: /// The singleton instance. diff --git a/TAO/tao/PortableServer/SUpcall_commands.cpp b/TAO/tao/PortableServer/SUpcall_commands.cpp index 6ccba4791cb..bcda45a6750 100644 --- a/TAO/tao/PortableServer/SUpcall_commands.cpp +++ b/TAO/tao/PortableServer/SUpcall_commands.cpp @@ -16,7 +16,7 @@ #include "tao/Object.h" void -_is_a_thru_poa_Upcall_Command::execute (void) +_is_a_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -35,7 +35,7 @@ _is_a_thru_poa_Upcall_Command::execute (void) } void -_is_a_Upcall_Command::execute (void) +_is_a_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg (); @@ -50,7 +50,7 @@ _is_a_Upcall_Command::execute (void) #if (TAO_HAS_MINIMUM_CORBA == 0) void -_non_existent_thru_poa_Upcall_Command::execute (void) +_non_existent_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::ACE_InputCDR::to_boolean> ( @@ -62,7 +62,7 @@ _non_existent_thru_poa_Upcall_Command::execute (void) } void -_non_existent_Upcall_Command::execute (void) +_non_existent_Upcall_Command::execute () { TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::ACE_InputCDR::to_boolean>::ret_val *> (this->args_[0])->arg (); @@ -74,7 +74,7 @@ _non_existent_Upcall_Command::execute (void) # if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) void -_get_component_thru_poa_Upcall_Command::execute (void) +_get_component_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< ::CORBA::Object> ( @@ -86,7 +86,7 @@ _get_component_thru_poa_Upcall_Command::execute (void) } void -_get_component_Upcall_Command::execute (void) +_get_component_Upcall_Command::execute () { TAO::SArg_Traits< ::CORBA::Object>::ret_arg_type retval = static_cast<TAO::SArg_Traits< ::CORBA::Object>::ret_val *> (this->args_[0])->arg (); @@ -99,7 +99,7 @@ _get_component_Upcall_Command::execute (void) void -_repository_id_thru_poa_Upcall_Command::execute (void) +_repository_id_thru_poa_Upcall_Command::execute () { TAO::SArg_Traits< char *>::ret_arg_type retval = TAO::Portable_Server::get_ret_arg< char *> ( @@ -111,7 +111,7 @@ _repository_id_thru_poa_Upcall_Command::execute (void) } void -_repository_id_Upcall_Command::execute(void ) +_repository_id_Upcall_Command::execute( ) { TAO::SArg_Traits< char *>::ret_arg_type retval = static_cast<TAO::SArg_Traits< char *>::ret_val *> (this->args_[0])->arg (); diff --git a/TAO/tao/PortableServer/SUpcall_commands.h b/TAO/tao/PortableServer/SUpcall_commands.h index d68ee481d18..e7ed10c074b 100644 --- a/TAO/tao/PortableServer/SUpcall_commands.h +++ b/TAO/tao/PortableServer/SUpcall_commands.h @@ -52,7 +52,7 @@ public: , args_ (args) {} - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -77,7 +77,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -105,7 +105,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; TAO_Operation_Details const * const operation_details_; @@ -129,7 +129,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -157,7 +157,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -182,7 +182,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -209,7 +209,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; @@ -234,7 +234,7 @@ public: { } - virtual void execute (void); + virtual void execute (); private: TAO_ServantBase * const servant_; diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp index c716959b96f..6c7eb85a171 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.cpp +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - ServantRetentionPolicy::copy (void) + ServantRetentionPolicy::copy () { ServantRetentionPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - ServantRetentionPolicy::destroy (void) + ServantRetentionPolicy::destroy () { } ::PortableServer::ServantRetentionPolicyValue - ServantRetentionPolicy::value (void) + ServantRetentionPolicy::value () { return this->value_; } CORBA::PolicyType - ServantRetentionPolicy::policy_type (void) + ServantRetentionPolicy::policy_type () { return ::PortableServer::SERVANT_RETENTION_POLICY_ID; } TAO_Cached_Policy_Type - ServantRetentionPolicy::_tao_cached_type (void) const + ServantRetentionPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_SERVANT_RETENTION; } TAO_Policy_Scope - ServantRetentionPolicy::_tao_scope (void) const + ServantRetentionPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ServantRetentionPolicy.h b/TAO/tao/PortableServer/ServantRetentionPolicy.h index d62c550b224..b39152dad1c 100644 --- a/TAO/tao/PortableServer/ServantRetentionPolicy.h +++ b/TAO/tao/PortableServer/ServantRetentionPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ServantRetentionPolicy (::PortableServer::ServantRetentionPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ServantRetentionPolicyValue value (void); + ::PortableServer::ServantRetentionPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ServantRetentionPolicyValue value_; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategy.h b/TAO/tao/PortableServer/ServantRetentionStrategy.h index 436eb6a185d..eb54dc6520a 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategy.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategy.h @@ -37,7 +37,7 @@ namespace TAO : public Policy_Strategy { public: - virtual CORBA::ULong waiting_servant_deactivation (void) const = 0; + virtual CORBA::ULong waiting_servant_deactivation () const = 0; virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call) = 0; @@ -81,7 +81,7 @@ namespace TAO const PortableServer::ObjectId &id, bool indirect) = 0; - virtual void deactivate_all_objects (void) = 0; + virtual void deactivate_all_objects () = 0; virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant) = 0; diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp index 2ace6f13b39..e4e39fbe4bd 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.cpp @@ -24,7 +24,7 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain (void) : + ServantRetentionStrategyNonRetain::ServantRetentionStrategyNonRetain () : poa_ (0), sys_id_count_ (0) { @@ -37,7 +37,7 @@ namespace TAO } void - ServantRetentionStrategyNonRetain::strategy_cleanup (void) + ServantRetentionStrategyNonRetain::strategy_cleanup () { poa_ = 0; } @@ -129,13 +129,13 @@ namespace TAO } CORBA::ULong - ServantRetentionStrategyNonRetain::waiting_servant_deactivation (void) const + ServantRetentionStrategyNonRetain::waiting_servant_deactivation () const { return 0; } void - ServantRetentionStrategyNonRetain::deactivate_all_objects (void) + ServantRetentionStrategyNonRetain::deactivate_all_objects () { } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h index 837e0868b5a..49879c3a222 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyNonRetain.h @@ -33,13 +33,13 @@ namespace TAO : public ServantRetentionStrategy { public: - ServantRetentionStrategyNonRetain (void); + ServantRetentionStrategyNonRetain (); virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; virtual PortableServer::ObjectId * @@ -86,7 +86,7 @@ namespace TAO const PortableServer::ObjectId &system_id, CORBA::Short &priority); - virtual void deactivate_all_objects (void); + virtual void deactivate_all_objects (); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp index 8c5d451f874..b92e56025cc 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.cpp @@ -26,7 +26,7 @@ namespace TAO { namespace Portable_Server { - ServantRetentionStrategyRetain::ServantRetentionStrategyRetain (void) : + ServantRetentionStrategyRetain::ServantRetentionStrategyRetain () : ServantRetentionStrategyNonRetain (), active_object_map_ (), waiting_servant_deactivation_ (0) @@ -61,7 +61,7 @@ namespace TAO } void - ServantRetentionStrategyRetain::strategy_cleanup (void) + ServantRetentionStrategyRetain::strategy_cleanup () { } @@ -433,13 +433,13 @@ namespace TAO } CORBA::ULong - ServantRetentionStrategyRetain::waiting_servant_deactivation (void) const + ServantRetentionStrategyRetain::waiting_servant_deactivation () const { return waiting_servant_deactivation_; } void - ServantRetentionStrategyRetain::deactivate_all_objects (void) + ServantRetentionStrategyRetain::deactivate_all_objects () { // If the etherealize_objects parameter is TRUE, the POA has the // RETAIN policy, and a servant manager is registered with the POA, @@ -963,7 +963,7 @@ namespace TAO ::PortableServer::ServantRetentionPolicyValue - ServantRetentionStrategyRetain::type(void) const + ServantRetentionStrategyRetain::type() const { return ::PortableServer::RETAIN; } diff --git a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h index 500629cf1c0..46d47061731 100644 --- a/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h +++ b/TAO/tao/PortableServer/ServantRetentionStrategyRetain.h @@ -32,13 +32,13 @@ namespace TAO : public ServantRetentionStrategyNonRetain { public: - ServantRetentionStrategyRetain (void); + ServantRetentionStrategyRetain (); - CORBA::ULong waiting_servant_deactivation (void) const; + CORBA::ULong waiting_servant_deactivation () const; virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); virtual int is_servant_in_map (PortableServer::Servant servant, bool &wait_occurred_restart_call); @@ -85,7 +85,7 @@ namespace TAO const PortableServer::ObjectId &system_id, CORBA::Short &priority); - virtual void deactivate_all_objects (void); + virtual void deactivate_all_objects (); virtual PortableServer::ObjectId *servant_to_user_id ( PortableServer::Servant servant); diff --git a/TAO/tao/PortableServer/Servant_Base.cpp b/TAO/tao/PortableServer/Servant_Base.cpp index 9bd8738a623..8a9f6f3cb7b 100644 --- a/TAO/tao/PortableServer/Servant_Base.cpp +++ b/TAO/tao/PortableServer/Servant_Base.cpp @@ -79,12 +79,12 @@ TAO_ServantBase::operator= (const TAO_ServantBase &rhs) return *this; } -TAO_ServantBase::~TAO_ServantBase (void) +TAO_ServantBase::~TAO_ServantBase () { } PortableServer::POA_ptr -TAO_ServantBase::_default_POA (void) +TAO_ServantBase::_default_POA () { CORBA::Object_var object = TAO_ORB_Core_instance ()->root_poa (); @@ -434,13 +434,13 @@ TAO_ServantBase::_is_a (const char *logical_type_id) #if (TAO_HAS_MINIMUM_CORBA == 0) CORBA::Boolean -TAO_ServantBase::_non_existent (void) +TAO_ServantBase::_non_existent () { return false; } CORBA::InterfaceDef_ptr -TAO_ServantBase::_get_interface (void) +TAO_ServantBase::_get_interface () { TAO_IFR_Client_Adapter *adapter = ACE_Dynamic_Service<TAO_IFR_Client_Adapter>::instance ( @@ -459,13 +459,13 @@ TAO_ServantBase::_get_interface (void) #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) CORBA::Object_ptr -TAO_ServantBase::_get_component (void) +TAO_ServantBase::_get_component () { return CORBA::Object::_nil (); } #endif char * -TAO_ServantBase::_repository_id (void) +TAO_ServantBase::_repository_id () { return CORBA::string_dup (this->_interface_repository_id ()); } @@ -493,7 +493,7 @@ TAO_ServantBase::_find (const char *opname, } TAO_Stub * -TAO_ServantBase::_create_stub (void) +TAO_ServantBase::_create_stub () { TAO_Stub *stub = 0; @@ -645,13 +645,13 @@ TAO_ServantBase::asynchronous_upcall_dispatch ( } void -TAO_ServantBase::_add_ref (void) +TAO_ServantBase::_add_ref () { ++this->ref_count_; } void -TAO_ServantBase::_remove_ref (void) +TAO_ServantBase::_remove_ref () { CORBA::ULong const new_count = --this->ref_count_; @@ -662,7 +662,7 @@ TAO_ServantBase::_remove_ref (void) } CORBA::ULong -TAO_ServantBase::_refcount_value (void) const +TAO_ServantBase::_refcount_value () const { #if defined (ACE_HAS_CPP11) return this->ref_count_; diff --git a/TAO/tao/PortableServer/Servant_Base.h b/TAO/tao/PortableServer/Servant_Base.h index 1cc77f3bed1..995b6eb0293 100644 --- a/TAO/tao/PortableServer/Servant_Base.h +++ b/TAO/tao/PortableServer/Servant_Base.h @@ -69,7 +69,7 @@ public: typedef CORBA::Object_var _stub_var_type; /// Destructor. - virtual ~TAO_ServantBase (void); + virtual ~TAO_ServantBase (); static void _is_a_skel (TAO_ServerRequest & req, TAO::Portable_Server::Servant_Upcall* servant_upcall, @@ -108,29 +108,29 @@ public: #endif /* TAO_HAS_MINIMUM_CORBA */ /// Returns the default POA for this servant. - virtual PortableServer::POA_ptr _default_POA (void); + virtual PortableServer::POA_ptr _default_POA (); /// Local implementation of the CORBA::Object::_is_a method. virtual CORBA::Boolean _is_a (const char *logical_type_id); #if (TAO_HAS_MINIMUM_CORBA == 0) /// Default _non_existent: always returns false. - virtual CORBA::Boolean _non_existent (void); + virtual CORBA::Boolean _non_existent (); /// Query the Interface Repository for the interface definition. - virtual CORBA::InterfaceDef_ptr _get_interface (void); + virtual CORBA::InterfaceDef_ptr _get_interface (); #if !defined (CORBA_E_COMPACT) && !defined (CORBA_E_MICRO) /// Default _get_component: always returns CORBA::Object::_nil(). - virtual CORBA::Object_ptr _get_component (void); + virtual CORBA::Object_ptr _get_component (); #endif /// Get the repository id. - virtual char * _repository_id (void); + virtual char * _repository_id (); #endif /* TAO_HAS_MINIMUM_CORBA */ /// This is an auxiliary method for _this() and _narrow(). - virtual TAO_Stub *_create_stub (void); + virtual TAO_Stub *_create_stub (); /** * Dispatches a request to the object: find the operation, cast the @@ -155,26 +155,26 @@ public: const size_t length = 0); /// Get this interface's repository id (TAO specific). - virtual const char *_interface_repository_id (void) const = 0; + virtual const char *_interface_repository_id () const = 0; //@{ /** * @name Reference Counting Operations */ /// Increase reference count by one. - virtual void _add_ref (void); + virtual void _add_ref (); /** * Decreases reference count by one; if the resulting reference * count equals zero, _remove_ref invokes delete on its this pointer * in order to destroy the servant. */ - virtual void _remove_ref (void); + virtual void _remove_ref (); /** * Returns the current reference count value. */ - virtual CORBA::ULong _refcount_value (void) const; + virtual CORBA::ULong _refcount_value () const; //@} virtual void _collocated_dispatch (::CORBA::Object_ptr obj, diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.cpp b/TAO/tao/PortableServer/Servant_Dispatcher.cpp index fe0524cd9d1..722af63e3c9 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.cpp +++ b/TAO/tao/PortableServer/Servant_Dispatcher.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher (void) +TAO_Servant_Dispatcher::~TAO_Servant_Dispatcher () { } diff --git a/TAO/tao/PortableServer/Servant_Dispatcher.h b/TAO/tao/PortableServer/Servant_Dispatcher.h index bf48fea7dc4..ced50eec720 100644 --- a/TAO/tao/PortableServer/Servant_Dispatcher.h +++ b/TAO/tao/PortableServer/Servant_Dispatcher.h @@ -48,7 +48,7 @@ namespace PortableServer class TAO_PortableServer_Export TAO_Servant_Dispatcher { public: - virtual ~TAO_Servant_Dispatcher (void); + virtual ~TAO_Servant_Dispatcher (); /// Pre_invoke remote request. virtual void pre_invoke_remote_request ( diff --git a/TAO/tao/PortableServer/Servant_Upcall.cpp b/TAO/tao/PortableServer/Servant_Upcall.cpp index e08ac1ae707..e77ac5fb31a 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.cpp +++ b/TAO/tao/PortableServer/Servant_Upcall.cpp @@ -179,7 +179,7 @@ namespace TAO } void - Servant_Upcall::pre_invoke_collocated_request (void) + Servant_Upcall::pre_invoke_collocated_request () { this->object_adapter_->servant_dispatcher_->pre_invoke_collocated_request ( this->poa (), @@ -188,14 +188,14 @@ namespace TAO } void - Servant_Upcall::post_invoke (void) + Servant_Upcall::post_invoke () { this->object_adapter_->servant_dispatcher_->post_invoke ( this->poa (), this->pre_invoke_state_); } - Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State (void) + Servant_Upcall::Pre_Invoke_State::Pre_Invoke_State () : state_ (NO_ACTION_REQUIRED), original_native_priority_ (0), original_CORBA_priority_ (0) @@ -225,13 +225,13 @@ namespace TAO return this->poa_; } - Servant_Upcall::~Servant_Upcall (void) + Servant_Upcall::~Servant_Upcall () { this->upcall_cleanup (); } void - Servant_Upcall::upcall_cleanup (void) + Servant_Upcall::upcall_cleanup () { this->post_invoke (); @@ -292,14 +292,14 @@ namespace TAO } void - Servant_Upcall::post_invoke_servant_cleanup (void) + Servant_Upcall::post_invoke_servant_cleanup () { this->poa_->post_invoke_servant_cleanup (this->current_context_.object_id (), *this); } void - Servant_Upcall::single_threaded_poa_setup (void) + Servant_Upcall::single_threaded_poa_setup () { #if (TAO_HAS_MINIMUM_POA == 0) // Serialize servants (if necessary). @@ -317,7 +317,7 @@ namespace TAO } void - Servant_Upcall::single_threaded_poa_cleanup (void) + Servant_Upcall::single_threaded_poa_cleanup () { #if (TAO_HAS_MINIMUM_POA == 0) // Since the servant lock was acquired, we must release it. @@ -328,7 +328,7 @@ namespace TAO } void - Servant_Upcall::increment_servant_refcount (void) + Servant_Upcall::increment_servant_refcount () { // Cleanup servant related stuff. if (this->active_object_map_entry_ != 0) @@ -336,7 +336,7 @@ namespace TAO } void - Servant_Upcall::servant_cleanup (void) + Servant_Upcall::servant_cleanup () { // Cleanup servant related stuff. if (this->active_object_map_entry_ != 0) @@ -369,7 +369,7 @@ namespace TAO } void - Servant_Upcall::poa_cleanup (void) + Servant_Upcall::poa_cleanup () { // Decrease <poa->outstanding_requests_> now that the upcall // is complete. diff --git a/TAO/tao/PortableServer/Servant_Upcall.h b/TAO/tao/PortableServer/Servant_Upcall.h index a7f5f2ae320..319a6074389 100644 --- a/TAO/tao/PortableServer/Servant_Upcall.h +++ b/TAO/tao/PortableServer/Servant_Upcall.h @@ -70,7 +70,7 @@ namespace TAO { public: /// Constructor. - Pre_Invoke_State (void); + Pre_Invoke_State (); enum State { @@ -93,7 +93,7 @@ namespace TAO explicit Servant_Upcall (TAO_ORB_Core *orb_core); /// Destructor. - ~Servant_Upcall (void); + ~Servant_Upcall (); /// Locate POA and servant. int prepare_for_upcall (const TAO::ObjectKey &key, @@ -110,41 +110,41 @@ namespace TAO void pre_invoke_remote_request (TAO_ServerRequest &req); /// Run pre_invoke for a collocated request. - void pre_invoke_collocated_request (void); + void pre_invoke_collocated_request (); /// Run post_invoke for a request. - void post_invoke (void); + void post_invoke (); /// Locate POA. ::TAO_Root_POA *lookup_POA (const TAO::ObjectKey &key); /// POA accessor. - ::TAO_Root_POA &poa (void) const; + ::TAO_Root_POA &poa () const; /// Object Adapter accessor. - TAO_Object_Adapter &object_adapter (void) const; + TAO_Object_Adapter &object_adapter () const; /// System ID accessor. - const PortableServer::ObjectId &id (void) const; + const PortableServer::ObjectId &id () const; /// User ID accessors. This is the same value returned by /// PortableServer::Current::get_object_id(). void user_id (const PortableServer::ObjectId *); - const PortableServer::ObjectId &user_id (void) const; + const PortableServer::ObjectId &user_id () const; /// Servant accessor. - PortableServer::Servant servant (void) const; + PortableServer::Servant servant () const; #if (TAO_HAS_MINIMUM_POA == 0) /// Get the Servant Locator's cookie - void* locator_cookie (void) const; + void* locator_cookie () const; /// Set the Servant Locator's cookie void locator_cookie (void* cookie); /// Get the operation name. - const char *operation (void) const; + const char *operation () const; /// Set the operation name. void operation (const char *); @@ -155,10 +155,10 @@ namespace TAO void active_object_map_entry (TAO_Active_Object_Map_Entry *entry); /// Get the active_object_map_entry. - TAO_Active_Object_Map_Entry *active_object_map_entry (void) const; + TAO_Active_Object_Map_Entry *active_object_map_entry () const; /// Get the priority for the current upcall. - CORBA::Short priority (void) const; + CORBA::Short priority () const; enum State { @@ -170,24 +170,24 @@ namespace TAO }; /// Get the state. - State state (void) const; + State state () const; /// Set the state. void state (State); /// Increment the refcount - void increment_servant_refcount (void); + void increment_servant_refcount (); protected: - void post_invoke_servant_cleanup (void); - void single_threaded_poa_setup (void); - void single_threaded_poa_cleanup (void); - void servant_cleanup (void); - void poa_cleanup (void); + void post_invoke_servant_cleanup (); + void single_threaded_poa_setup (); + void single_threaded_poa_cleanup (); + void servant_cleanup (); + void poa_cleanup (); /// Clean-up / reset state of this Servant_Upcall object. - void upcall_cleanup (void); + void upcall_cleanup (); protected: diff --git a/TAO/tao/PortableServer/Servant_var.h b/TAO/tao/PortableServer/Servant_var.h index 1c146dc0eb9..24f66407de2 100644 --- a/TAO/tao/PortableServer/Servant_var.h +++ b/TAO/tao/PortableServer/Servant_var.h @@ -55,7 +55,7 @@ namespace PortableServer /** * This destructor doesn't throw exceptions. */ - ~Servant_var (void); + ~Servant_var (); /// Assignment operator. Assumes ownership of @c p. Servant_var<T> & operator= (T * p); diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h index 710cf1f494f..3e217820af9 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.h +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.h @@ -38,13 +38,13 @@ namespace TAO class In_Special_Basic_SArgument_T : public InArgument { public: - In_Special_Basic_SArgument_T (void); + In_Special_Basic_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; private: S x_; @@ -63,14 +63,14 @@ namespace TAO class Inout_Special_Basic_SArgument_T : public InoutArgument { public: - Inout_Special_Basic_SArgument_T (void); + Inout_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -89,13 +89,13 @@ namespace TAO class Out_Special_Basic_SArgument_T : public OutArgument { public: - Out_Special_Basic_SArgument_T (void); + Out_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -114,13 +114,13 @@ namespace TAO class Ret_Special_Basic_SArgument_T : public RetArgument { public: - Ret_Special_Basic_SArgument_T (void); + Ret_Special_Basic_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; diff --git a/TAO/tao/PortableServer/StrategyFactory.cpp b/TAO/tao/PortableServer/StrategyFactory.cpp index dc03abc1ed4..575067c77bf 100644 --- a/TAO/tao/PortableServer/StrategyFactory.cpp +++ b/TAO/tao/PortableServer/StrategyFactory.cpp @@ -8,7 +8,7 @@ namespace TAO { namespace Portable_Server { - StrategyFactory::~StrategyFactory (void) + StrategyFactory::~StrategyFactory () { } } /* namespace Portable_Server */ diff --git a/TAO/tao/PortableServer/StrategyFactory.h b/TAO/tao/PortableServer/StrategyFactory.h index fac77d9bff8..ac0b08687ae 100644 --- a/TAO/tao/PortableServer/StrategyFactory.h +++ b/TAO/tao/PortableServer/StrategyFactory.h @@ -31,7 +31,7 @@ namespace TAO : public ACE_Service_Object { public: - virtual ~StrategyFactory (void); + virtual ~StrategyFactory (); }; } /* namespace Portable_Server */ } /* namespace TAO */ diff --git a/TAO/tao/PortableServer/ThreadPolicy.cpp b/TAO/tao/PortableServer/ThreadPolicy.cpp index c7f2869db2b..38dbb7e1f15 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.cpp +++ b/TAO/tao/PortableServer/ThreadPolicy.cpp @@ -18,7 +18,7 @@ namespace TAO } CORBA::Policy_ptr - ThreadPolicy::copy (void) + ThreadPolicy::copy () { ThreadPolicy *copy = 0; ACE_NEW_THROW_EX (copy, @@ -29,30 +29,30 @@ namespace TAO } void - ThreadPolicy::destroy (void) + ThreadPolicy::destroy () { } ::PortableServer::ThreadPolicyValue - ThreadPolicy::value (void) + ThreadPolicy::value () { return value_; } CORBA::PolicyType - ThreadPolicy::policy_type (void) + ThreadPolicy::policy_type () { return ::PortableServer::THREAD_POLICY_ID; } TAO_Cached_Policy_Type - ThreadPolicy::_tao_cached_type (void) const + ThreadPolicy::_tao_cached_type () const { return TAO_CACHED_POLICY_THREAD; } TAO_Policy_Scope - ThreadPolicy::_tao_scope (void) const + ThreadPolicy::_tao_scope () const { return TAO_POLICY_POA_SCOPE; } diff --git a/TAO/tao/PortableServer/ThreadPolicy.h b/TAO/tao/PortableServer/ThreadPolicy.h index 9de46c892bd..e48bee84d72 100644 --- a/TAO/tao/PortableServer/ThreadPolicy.h +++ b/TAO/tao/PortableServer/ThreadPolicy.h @@ -43,19 +43,19 @@ namespace TAO public: ThreadPolicy (::PortableServer::ThreadPolicyValue value); - CORBA::Policy_ptr copy (void); + CORBA::Policy_ptr copy (); - void destroy (void); + void destroy (); - ::PortableServer::ThreadPolicyValue value (void); + ::PortableServer::ThreadPolicyValue value (); - CORBA::PolicyType policy_type (void); + CORBA::PolicyType policy_type (); /// Return the cached policy type for this policy. - TAO_Cached_Policy_Type _tao_cached_type (void) const; + TAO_Cached_Policy_Type _tao_cached_type () const; /// Returns the scope at which this policy can be applied. See orbconf.h. - TAO_Policy_Scope _tao_scope (void) const; + TAO_Policy_Scope _tao_scope () const; private: ::PortableServer::ThreadPolicyValue value_; diff --git a/TAO/tao/PortableServer/ThreadStrategy.cpp b/TAO/tao/PortableServer/ThreadStrategy.cpp index 7b36ab1a869..647081f0660 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.cpp +++ b/TAO/tao/PortableServer/ThreadStrategy.cpp @@ -12,7 +12,7 @@ namespace TAO } void - ThreadStrategy::strategy_cleanup (void) + ThreadStrategy::strategy_cleanup () { } } diff --git a/TAO/tao/PortableServer/ThreadStrategy.h b/TAO/tao/PortableServer/ThreadStrategy.h index 29b9ab8bafa..14488287a2b 100644 --- a/TAO/tao/PortableServer/ThreadStrategy.h +++ b/TAO/tao/PortableServer/ThreadStrategy.h @@ -37,7 +37,7 @@ namespace TAO virtual void strategy_init (TAO_Root_POA *poa); - virtual void strategy_cleanup(void); + virtual void strategy_cleanup(); virtual ::PortableServer::ThreadPolicyValue type() const = 0; }; diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.h b/TAO/tao/PortableServer/UB_String_SArgument_T.h index 8e19dc77413..457e761bf06 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.h +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.h @@ -33,13 +33,13 @@ namespace TAO class In_UB_String_SArgument_T : public InArgument { public: - In_UB_String_SArgument_T (void); + In_UB_String_SArgument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const * arg (void) const; + S const * arg () const; private: S_var x_; @@ -55,14 +55,14 @@ namespace TAO class Inout_UB_String_SArgument_T : public InoutArgument { public: - Inout_UB_String_SArgument_T (void); + Inout_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; @@ -78,13 +78,13 @@ namespace TAO class Out_UB_String_SArgument_T : public OutArgument { public: - Out_UB_String_SArgument_T (void); + Out_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; @@ -100,13 +100,13 @@ namespace TAO class Ret_UB_String_SArgument_T : public RetArgument { public: - Ret_UB_String_SArgument_T (void); + Ret_UB_String_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S_var x_; diff --git a/TAO/tao/PortableServer/Upcall_Command.cpp b/TAO/tao/PortableServer/Upcall_Command.cpp index 52dc05020e2..b1133c9f623 100644 --- a/TAO/tao/PortableServer/Upcall_Command.cpp +++ b/TAO/tao/PortableServer/Upcall_Command.cpp @@ -2,7 +2,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO::Upcall_Command::~Upcall_Command (void) +TAO::Upcall_Command::~Upcall_Command () { } diff --git a/TAO/tao/PortableServer/Upcall_Command.h b/TAO/tao/PortableServer/Upcall_Command.h index 6184aa987dd..2b32a23d33e 100644 --- a/TAO/tao/PortableServer/Upcall_Command.h +++ b/TAO/tao/PortableServer/Upcall_Command.h @@ -41,10 +41,10 @@ namespace TAO { public: /// Destructor. - virtual ~Upcall_Command (void); + virtual ~Upcall_Command (); /// Execute the upcall. - virtual void execute (void) = 0; + virtual void execute () = 0; }; } // End namespace TAO diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.h b/TAO/tao/PortableServer/Var_Size_SArgument_T.h index a353331aa48..07773260e03 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.h +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.h @@ -38,7 +38,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; private: S x_; @@ -55,14 +55,14 @@ namespace TAO class Inout_Var_Size_SArgument_T : public InoutArgument { public: - Inout_Var_Size_SArgument_T (void); + Inout_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S x_; @@ -79,13 +79,13 @@ namespace TAO class Out_Var_Size_SArgument_T : public OutArgument { public: - Out_Var_Size_SArgument_T (void); + Out_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: typename S::_var_type x_; @@ -102,13 +102,13 @@ namespace TAO class Ret_Var_Size_SArgument_T : public RetArgument { public: - Ret_Var_Size_SArgument_T (void); + Ret_Var_Size_SArgument_T (); virtual CORBA::Boolean marshal (TAO_OutputCDR &cdr); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: typename S::_var_type x_; diff --git a/TAO/tao/Profile.h b/TAO/tao/Profile.h index c1d2f4ed21a..fc2eee3bee7 100644 --- a/TAO/tao/Profile.h +++ b/TAO/tao/Profile.h @@ -66,32 +66,32 @@ public: */ //@{ /// The tag, each concrete class will have a specific tag value. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Return a pointer to this profile's version. This object /// maintains ownership. - const TAO_GIOP_Message_Version &version (void) const; + const TAO_GIOP_Message_Version &version () const; /// Get a pointer to the TAO_ORB_Core. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Increase the reference count by one on this object. - unsigned long _incr_refcnt (void); + unsigned long _incr_refcnt (); /// Decrement the object's reference count. When this count goes to /// 0 this object will be deleted. - unsigned long _decr_refcnt (void); + unsigned long _decr_refcnt (); /// Keep a pointer to the forwarded profile void forward_to (TAO_MProfile *mprofiles); /// MProfile accessor - TAO_MProfile* forward_to (void); + TAO_MProfile* forward_to (); /// Access the tagged components, notice that they they could be /// empty (or ignored) for non-GIOP protocols (and even for GIOP-1.0) - const TAO_Tagged_Components& tagged_components (void) const; - TAO_Tagged_Components& tagged_components (void); + const TAO_Tagged_Components& tagged_components () const; + TAO_Tagged_Components& tagged_components (); /// Add the given tagged component to the profile. void add_tagged_component (const IOP::TaggedComponent &component); @@ -100,14 +100,14 @@ public: * Return the current addressing mode for this profile. * In almost all cases, this is TAO_Target_Specification::Key_Addr. */ - CORBA::Short addressing_mode (void) const; + CORBA::Short addressing_mode () const; /// @deprecated Return a reference to the Object Key. - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Obtain the object key, return 0 if the profile cannot be parsed. /// The memory is owned by the caller! - TAO::ObjectKey *_key (void) const; + TAO::ObjectKey *_key () const; //@} /** @@ -130,7 +130,7 @@ public: * return the reference to that. This method is necessary for GIOP * 1.2. */ - IOP::TaggedProfile *create_tagged_profile (void); + IOP::TaggedProfile *create_tagged_profile (); /// This method sets the client exposed policies, i.e., the ones /// propagated in the IOR, for this profile. @@ -140,10 +140,10 @@ public: virtual void get_policies (CORBA::PolicyList &policy_list); /// Returns true if this profile can specify multicast endpoints. - virtual int supports_multicast (void) const; + virtual int supports_multicast () const; /// Returns true if this profile supports non blocking oneways - virtual bool supports_non_blocking_oneways (void) const; + virtual bool supports_non_blocking_oneways () const; /** * Set the addressing mode if a remote servant replies with @@ -175,7 +175,7 @@ public: virtual void addressing_mode (CORBA::Short addr_mode); /// The object key delimiter. - virtual char object_key_delimiter (void) const = 0; + virtual char object_key_delimiter () const = 0; /// Initialize this object using the given input string. /// Supports URL style of object references @@ -184,14 +184,14 @@ public: /// Return a string representation for this profile. Client must /// deallocate memory. Only one endpoint is included into the /// string. - virtual char* to_string (void) const = 0; + virtual char* to_string () const = 0; /** * Encodes this profile's endpoints into a tagged component. * This is done only if RTCORBA is enabled, since currently this is * the only case when we have more than one endpoint per profile. */ - virtual int encode_endpoints (void) = 0; + virtual int encode_endpoints () = 0; /** * Encodes this profile's endpoints into protocol specific tagged @@ -199,14 +199,14 @@ public: * endpoints on profiles. The only known implementation is IIOP, using * TAG_ALTERNATE_IIOP_ADDRESS components. */ - virtual int encode_alternate_endpoints (void); + virtual int encode_alternate_endpoints (); /** * Return a pointer to this profile's endpoint. If the profile * contains more than one endpoint, i.e., a list, the method returns * the head of the list. */ - virtual TAO_Endpoint *endpoint (void) = 0; + virtual TAO_Endpoint *endpoint () = 0; /** @@ -219,17 +219,17 @@ public: * to facilitate the Endpoint Policy's filtering function. * The default implementation of base_endpoint simply returns endpoint. */ - virtual TAO_Endpoint *base_endpoint (void); + virtual TAO_Endpoint *base_endpoint (); /// Return how many endpoints this profile contains. - virtual CORBA::ULong endpoint_count (void) const = 0; + virtual CORBA::ULong endpoint_count () const = 0; /** * Return the first endpoint in the list that matches some filtering * constraint, such as IPv6 compatibility for IIOP endpoints. This * method is implemented in terms of TAO_Endpoint::next_filtered(). */ - TAO_Endpoint *first_filtered_endpoint (void); + TAO_Endpoint *first_filtered_endpoint (); /// Return the next filtered endpoint in the list after the one /// passed in. This method is implemented in terms of @@ -275,7 +275,7 @@ public: protected: /// If you have a virtual method you need a virtual dtor. - virtual ~TAO_Profile (void); + virtual ~TAO_Profile (); /** * @name Protected template methods. @@ -294,7 +294,7 @@ protected: * version of TAO or some other ORB. This is not an error, and we * must proceed. Return 0 on success and -1 on failure. */ - virtual int decode_endpoints (void) = 0; + virtual int decode_endpoints () = 0; /// Protocol specific implementation of parse_string () virtual void parse_string_i (const char *string) = 0; @@ -331,15 +331,15 @@ protected: private: /// This object keeps ownership of this object - TAO_MProfile *forward_to_i (void); + TAO_MProfile *forward_to_i (); /// Verify that the current ORB's configuration supports tagged /// components in IORs. - void verify_orb_configuration (void); + void verify_orb_configuration (); /// Verify that the given profile supports tagged components, /// i.e. is not a GIOP 1.0 profile. - void verify_profile_version (void); + void verify_profile_version (); // Profiles should not be copied or assigned! TAO_Profile (const TAO_Profile&); @@ -425,19 +425,19 @@ public: // = The TAO_Profile methods look above virtual void parse_string (const char *string); - virtual char object_key_delimiter (void) const; - virtual char* to_string (void) const; + virtual char object_key_delimiter () const; + virtual char* to_string () const; virtual int decode (TAO_InputCDR& cdr); virtual int encode (TAO_OutputCDR &stream) const; - virtual int encode_endpoints (void); + virtual int encode_endpoints (); - virtual TAO::ObjectKey *_key (void) const; - virtual TAO_Endpoint *endpoint (void); - virtual CORBA::ULong endpoint_count (void) const; + virtual TAO::ObjectKey *_key () const; + virtual TAO_Endpoint *endpoint (); + virtual CORBA::ULong endpoint_count () const; virtual CORBA::ULong hash (CORBA::ULong max); virtual int decode_profile (TAO_InputCDR &cdr); - virtual int decode_endpoints (void); + virtual int decode_endpoints (); protected: virtual CORBA::Boolean do_is_equivalent (const TAO_Profile* other_profile); diff --git a/TAO/tao/Profile_Transport_Resolver.h b/TAO/tao/Profile_Transport_Resolver.h index 98848a61bc4..22902e6fafe 100644 --- a/TAO/tao/Profile_Transport_Resolver.h +++ b/TAO/tao/Profile_Transport_Resolver.h @@ -73,7 +73,7 @@ namespace TAO TAO_Stub *stub, bool block = true); - ~Profile_Transport_Resolver (void); + ~Profile_Transport_Resolver (); /// Method where the bunch of the action takes place. /** @@ -95,16 +95,16 @@ namespace TAO void profile (TAO_Profile *pfile); /// Accessor for profile. - TAO_Profile *profile (void) const; + TAO_Profile *profile () const; /// Accessor for TAO_Stub - TAO_Stub *stub (void) const; + TAO_Stub *stub () const; /// Accessor for the target in use - CORBA::Object *object (void) const; + CORBA::Object *object () const; /// Accessor for the transport reserved for this invocation. - TAO_Transport *transport (void) const; + TAO_Transport *transport () const; /// See if the transport cache has an available transport and /// use that one rather than trying to connect via the connector. @@ -115,12 +115,12 @@ namespace TAO /// Accessor to indicate whether we should block while /// establishing a connection. - bool blocked_connect (void) const; + bool blocked_connect () const; //@} /// Signal to let the resolver know that the transport has been /// released back to the cache. - void transport_released (void) const; + void transport_released () const; /// This is a callback method used by the endpoint selectors to /// delegate the responsibility of reserving a transport from the @@ -139,15 +139,15 @@ namespace TAO /// This method wraps a call to the orb core to see if parallel /// connection attempts are even desired. This is controlled by /// the -ORBUseParallelConnects 1|0 commandline option. - bool use_parallel_connect (void) const; + bool use_parallel_connect () const; /// Initialize the inconsistent policy list that this object has /// cached. - void init_inconsistent_policies (void); + void init_inconsistent_policies (); - CORBA::PolicyList *inconsistent_policies (void) const; + CORBA::PolicyList *inconsistent_policies () const; - CORBA::PolicyList *steal_inconsistent_policies (void); + CORBA::PolicyList *steal_inconsistent_policies (); private: /// Helper method to access get the connection timeout from the diff --git a/TAO/tao/Protocols_Hooks.h b/TAO/tao/Protocols_Hooks.h index e7edfa9bc9d..3a8c76a844f 100644 --- a/TAO/tao/Protocols_Hooks.h +++ b/TAO/tao/Protocols_Hooks.h @@ -40,7 +40,7 @@ class TAO_Export TAO_IIOP_Protocol_Properties { public: - TAO_IIOP_Protocol_Properties (void); + TAO_IIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -55,7 +55,7 @@ class TAO_Export TAO_UIOP_Protocol_Properties { public: - TAO_UIOP_Protocol_Properties (void); + TAO_UIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -65,7 +65,7 @@ class TAO_Export TAO_SHMIOP_Protocol_Properties { public: - TAO_SHMIOP_Protocol_Properties (void); + TAO_SHMIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -81,7 +81,7 @@ class TAO_Export TAO_DIOP_Protocol_Properties { public: - TAO_DIOP_Protocol_Properties (void); + TAO_DIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -94,7 +94,7 @@ class TAO_Export TAO_SCIOP_Protocol_Properties { public: - TAO_SCIOP_Protocol_Properties (void); + TAO_SCIOP_Protocol_Properties (); CORBA::Long send_buffer_size_; CORBA::Long recv_buffer_size_; @@ -109,7 +109,7 @@ class TAO_Export TAO_Protocols_Hooks : public ACE_Service_Object { public: /// Destructor - virtual ~TAO_Protocols_Hooks (void); + virtual ~TAO_Protocols_Hooks (); /// Initialize the protocols hooks instance. virtual void init_hooks (TAO_ORB_Core *orb_core) = 0; @@ -152,7 +152,7 @@ public: virtual void client_protocol_properties_at_orb_level ( TAO_SCIOP_Protocol_Properties &protocol_properties) = 0; - virtual CORBA::Long get_dscp_codepoint (void) = 0; + virtual CORBA::Long get_dscp_codepoint () = 0; virtual void get_selector_hook (CORBA::Policy *model_policy, CORBA::Boolean &is_client_propagated, diff --git a/TAO/tao/Pseudo_VarOut_T.h b/TAO/tao/Pseudo_VarOut_T.h index 138cb64df7e..92d2bc07ca1 100644 --- a/TAO/tao/Pseudo_VarOut_T.h +++ b/TAO/tao/Pseudo_VarOut_T.h @@ -53,16 +53,16 @@ template <typename T> class TAO_Pseudo_Var_T : private TAO_Base_var { public: - TAO_Pseudo_Var_T (void); + TAO_Pseudo_Var_T (); TAO_Pseudo_Var_T (typename T::_ptr_type); TAO_Pseudo_Var_T (const TAO_Pseudo_Var_T<T> &); - ~TAO_Pseudo_Var_T (void); + ~TAO_Pseudo_Var_T (); TAO_Pseudo_Var_T<T> & operator= (typename T::_ptr_type); TAO_Pseudo_Var_T<T> & operator= (const TAO_Pseudo_Var_T<T> &); - typename T::_ptr_type operator-> (void) const; + typename T::_ptr_type operator-> () const; operator typename T::_ptr_type const & () const; operator typename T::_ptr_type & (); @@ -72,13 +72,13 @@ public: typedef typename T::_ptr_type & _out_type; typedef typename T::_ptr_type _retn_type; - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); // TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; private: // Unimplemented - prevents widening assignment. @@ -109,8 +109,8 @@ public: TAO_Pseudo_Out_T<T> & operator= (typename T::_ptr_type); operator typename T::_ptr_type & (); - typename T::_ptr_type & ptr (void); - typename T::_ptr_type operator-> (void); + typename T::_ptr_type & ptr (); + typename T::_ptr_type operator-> (); private: typename T::_ptr_type & ptr_; diff --git a/TAO/tao/Queued_Data.h b/TAO/tao/Queued_Data.h index e7654cd1f75..ee3b6969cc2 100644 --- a/TAO/tao/Queued_Data.h +++ b/TAO/tao/Queued_Data.h @@ -69,34 +69,34 @@ public: /// Consolidate this fragments chained message blocks into one. /// @return -1 if consolidation failed, eg out or memory, otherwise 0 - int consolidate (void); + int consolidate (); /// Get missing data - size_t missing_data (void) const; + size_t missing_data () const; /// Set missing data void missing_data (size_t data); /// Get the GIOP version - TAO_GIOP_Message_Version const &giop_version (void) const; + TAO_GIOP_Message_Version const &giop_version () const; /// Get byte_order - CORBA::Octet byte_order (void) const; + CORBA::Octet byte_order () const; /// Get more fragments - CORBA::Boolean more_fragments (void) const; + CORBA::Boolean more_fragments () const; /// Get message type - GIOP::MsgType msg_type (void) const; + GIOP::MsgType msg_type () const; /// Get next - TAO_Queued_Data *next (void) const; + TAO_Queued_Data *next () const; /// Set next void next (TAO_Queued_Data* qd); /// Get message block - ACE_Message_Block *msg_block (void) const; + ACE_Message_Block *msg_block () const; /// Set message block void msg_block (ACE_Message_Block *mb); @@ -105,7 +105,7 @@ public: void state (const TAO_GIOP_Message_State& state); /// Get the state - const TAO_GIOP_Message_State& state (void) const; + const TAO_GIOP_Message_State& state () const; private: diff --git a/TAO/tao/Refcounted_ObjectKey.h b/TAO/tao/Refcounted_ObjectKey.h index 96142a512d6..29eb3ab6030 100644 --- a/TAO/tao/Refcounted_ObjectKey.h +++ b/TAO/tao/Refcounted_ObjectKey.h @@ -42,20 +42,20 @@ namespace TAO Refcounted_ObjectKey (const ObjectKey &ref); /// Accessor for the underlying ObjectKey. - const ObjectKey &object_key (void) const; + const ObjectKey &object_key () const; protected: friend class ObjectKey_Table; /// Protected destructor - ~Refcounted_ObjectKey (void); + ~Refcounted_ObjectKey (); /// Methods for incrementing refcount. - void incr_refcount (void); + void incr_refcount (); /// Methods for decrementing refcount. Return the refcount, used by the /// ObjectKey table. - CORBA::ULong decr_refcount (void); + CORBA::ULong decr_refcount (); private: /// The object key diff --git a/TAO/tao/Reply_Dispatcher.h b/TAO/tao/Reply_Dispatcher.h index 949bf0dfccd..b08cd76ed77 100644 --- a/TAO/tao/Reply_Dispatcher.h +++ b/TAO/tao/Reply_Dispatcher.h @@ -60,7 +60,7 @@ public: TAO_Reply_Dispatcher (ACE_Allocator *allocator = 0); /// Destructor. - virtual ~TAO_Reply_Dispatcher (void); + virtual ~TAO_Reply_Dispatcher (); /** * Dispatch the reply. Return 1 on sucess, -1 on error. @@ -74,7 +74,7 @@ public: virtual int dispatch_reply (TAO_Pluggable_Reply_Params ¶ms) = 0; /// Inform that the reply timed out - virtual void reply_timed_out (void) = 0; + virtual void reply_timed_out () = 0; /** * The used for the pending reply has been closed. @@ -84,12 +84,12 @@ public: * the exception, it would a matter of simply adding a boolean * argument to this function. */ - virtual void connection_closed (void) = 0; + virtual void connection_closed () = 0; /// Get the locate reply status. - GIOP::LocateStatusType locate_reply_status (void) const; + GIOP::LocateStatusType locate_reply_status () const; - GIOP::ReplyStatusType reply_status (void) const; + GIOP::ReplyStatusType reply_status () const; static void intrusive_add_ref (TAO_Reply_Dispatcher*); static void intrusive_remove_ref (TAO_Reply_Dispatcher*); diff --git a/TAO/tao/Reply_Dispatcher.inl b/TAO/tao/Reply_Dispatcher.inl index 14e89c247a8..c00cb49c567 100644 --- a/TAO/tao/Reply_Dispatcher.inl +++ b/TAO/tao/Reply_Dispatcher.inl @@ -3,13 +3,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL ACE_INLINE GIOP::LocateStatusType -TAO_Reply_Dispatcher::locate_reply_status (void) const +TAO_Reply_Dispatcher::locate_reply_status () const { return this->locate_reply_status_; } ACE_INLINE GIOP::ReplyStatusType -TAO_Reply_Dispatcher::reply_status (void) const +TAO_Reply_Dispatcher::reply_status () const { return this->reply_status_; } diff --git a/TAO/tao/RequestInterceptor_Adapter.h b/TAO/tao/RequestInterceptor_Adapter.h index 8ea064cf865..3a85af71c63 100644 --- a/TAO/tao/RequestInterceptor_Adapter.h +++ b/TAO/tao/RequestInterceptor_Adapter.h @@ -35,9 +35,9 @@ namespace TAO class TAO_Export RequestInterceptor_Adapter { public: - virtual ~RequestInterceptor_Adapter (void); + virtual ~RequestInterceptor_Adapter (); - virtual void destroy_interceptors (void) = 0; + virtual void destroy_interceptors () = 0; virtual void popTSC (TAO_ORB_Core *orb_core_) = 0; virtual void pushTSC (TAO_ORB_Core *orb_core_) = 0; diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h index 3f0b1812327..ab672ad3aec 100644 --- a/TAO/tao/Resource_Factory.h +++ b/TAO/tao/Resource_Factory.h @@ -58,14 +58,14 @@ public: /// Destructor that deallocates the factory object if the /// Protocol_Item retains ownership. - ~TAO_Protocol_Item (void); + ~TAO_Protocol_Item (); /// Return a reference to the character representation of the protocol /// factories name. - const ACE_CString &protocol_name (void); + const ACE_CString &protocol_name (); /// Return a pointer to the protocol factory. - TAO_Protocol_Factory *factory (void); + TAO_Protocol_Factory *factory (); /// Set the factory pointer's value. void factory (TAO_Protocol_Factory *factory, int owner = 0); @@ -133,52 +133,52 @@ public: TAO_LAZY }; - TAO_Resource_Factory (void); - virtual ~TAO_Resource_Factory (void); + TAO_Resource_Factory (); + virtual ~TAO_Resource_Factory (); // = Resource Retrieval /// @@ Backwards compatibility, return 1 if the ORB core should use /// Locked_Data_Blocks - virtual int use_locked_data_blocks (void) const; + virtual int use_locked_data_blocks () const; /// Return an ACE_Reactor to be utilized. - virtual ACE_Reactor *get_reactor (void); + virtual ACE_Reactor *get_reactor (); /// Reclaim reactor resources (e.g. deallocate, etc). virtual void reclaim_reactor (ACE_Reactor *reactor); /// Return a reference to the acceptor registry. - virtual TAO_Acceptor_Registry *get_acceptor_registry (void); + virtual TAO_Acceptor_Registry *get_acceptor_registry (); /// Return a connector to be utilized. - virtual TAO_Connector_Registry *get_connector_registry (void); + virtual TAO_Connector_Registry *get_connector_registry (); /// Return the Allocator's memory pool type virtual void use_local_memory_pool (bool); /// @name Access the input CDR allocators. //@{ - virtual ACE_Allocator* input_cdr_dblock_allocator (void); - virtual ACE_Allocator* input_cdr_buffer_allocator (void); - virtual ACE_Allocator* input_cdr_msgblock_allocator (void); + virtual ACE_Allocator* input_cdr_dblock_allocator (); + virtual ACE_Allocator* input_cdr_buffer_allocator (); + virtual ACE_Allocator* input_cdr_msgblock_allocator (); //@} // Return 1 when the input CDR allocator uses a lock else 0. - virtual int input_cdr_allocator_type_locked (void); + virtual int input_cdr_allocator_type_locked (); /// @name Access the output CDR allocators. //@{ - virtual ACE_Allocator* output_cdr_dblock_allocator (void); - virtual ACE_Allocator* output_cdr_buffer_allocator (void); - virtual ACE_Allocator* output_cdr_msgblock_allocator (void); + virtual ACE_Allocator* output_cdr_dblock_allocator (); + virtual ACE_Allocator* output_cdr_buffer_allocator (); + virtual ACE_Allocator* output_cdr_msgblock_allocator (); //@} /// Access the AMH response handler allocator - virtual ACE_Allocator* amh_response_handler_allocator (void); + virtual ACE_Allocator* amh_response_handler_allocator (); /// Access the AMI response handler allocator - virtual ACE_Allocator* ami_response_handler_allocator (void); + virtual ACE_Allocator* ami_response_handler_allocator (); /** * The protocol factory list is implemented in this class since @@ -186,7 +186,7 @@ public: * b) it is initialized at start up and then not altered. * Returns a container holding the list of loaded protocols. */ - virtual TAO_ProtocolFactorySet *get_protocol_factories (void); + virtual TAO_ProtocolFactorySet *get_protocol_factories (); /** * This method will loop through the protocol list and @@ -196,43 +196,43 @@ public: * that only one thread will call this method at ORB initialization. * NON-THREAD-SAFE */ - virtual int init_protocol_factories (void); + virtual int init_protocol_factories (); /// Gets the codeset manager. - virtual TAO_Codeset_Manager* codeset_manager (void); + virtual TAO_Codeset_Manager* codeset_manager (); /// This denotes the maximum number of connections that can be cached. - virtual int cache_maximum (void) const; + virtual int cache_maximum () const; /// This denotes the amount of entries to remove from the connection /// cache. - virtual int purge_percentage (void) const; + virtual int purge_percentage () const; /// Return the number of muxed connections that are allowed for a /// remote endpoint - virtual int max_muxed_connections (void) const; + virtual int max_muxed_connections () const; virtual int get_parser_names (char **&names, int &number_of_names); /// Creates the lock for the lock needed in the Cache Map /// @deprecated - virtual ACE_Lock *create_cached_connection_lock (void); + virtual ACE_Lock *create_cached_connection_lock (); /// Should the transport cache have a lock or not? Return 1 if the /// transport cache needs to be locked else return 0 - virtual int locked_transport_cache (void); + virtual int locked_transport_cache (); /// Creates the flushing strategy. The new instance is owned by the /// caller. - virtual TAO_Flushing_Strategy *create_flushing_strategy (void) = 0; + virtual TAO_Flushing_Strategy *create_flushing_strategy () = 0; /// Creates the connection purging strategy. - virtual TAO_Connection_Purging_Strategy *create_purging_strategy (void) = 0; + virtual TAO_Connection_Purging_Strategy *create_purging_strategy () = 0; /// Creates the leader followers strategy. The new instance is owned by the /// caller. - virtual TAO_LF_Strategy *create_lf_strategy (void) = 0; + virtual TAO_LF_Strategy *create_lf_strategy () = 0; /// Outgoing fragment creation strategy. virtual TAO_GIOP_Fragmentation_Strategy* @@ -243,12 +243,12 @@ public: /// this function should be called on the previously used (default) /// factory. This should result in proper error reporting if the /// user attempts to set options on an unused factory. - virtual void disable_factory (void) = 0; + virtual void disable_factory () = 0; /// Return the resource usage strategy. virtual TAO_Resource_Factory::Resource_Usage - resource_usage_strategy (void) const = 0; + resource_usage_strategy () const = 0; /// Return the value of the strategy that indicates whether /// the ORB should wait for the replies during shutdown or drop @@ -261,7 +261,7 @@ protected: * advanced_resource.cpp can call the one in default_resource.cpp * without calling unnecessary functions. */ - virtual int load_default_protocols (void); + virtual int load_default_protocols (); }; diff --git a/TAO/tao/Seq_Out_T.h b/TAO/tao/Seq_Out_T.h index 693b5508b24..e677d4e505e 100644 --- a/TAO/tao/Seq_Out_T.h +++ b/TAO/tao/Seq_Out_T.h @@ -42,10 +42,10 @@ public: TAO_Seq_Out_T &operator= (T *); operator T *& (); - T * operator-> (void); + T * operator-> (); T_elem operator[] (CORBA::ULong index); - T *& ptr (void); + T *& ptr (); private: T *& ptr_; diff --git a/TAO/tao/Seq_Var_T.h b/TAO/tao/Seq_Var_T.h index 45cb0491254..7596db9730a 100644 --- a/TAO/tao/Seq_Var_T.h +++ b/TAO/tao/Seq_Var_T.h @@ -34,14 +34,14 @@ class TAO_Seq_Var_Base_T public: typedef typename T::subscript_type T_elem; - TAO_Seq_Var_Base_T (void); + TAO_Seq_Var_Base_T (); TAO_Seq_Var_Base_T (T *); TAO_Seq_Var_Base_T (const TAO_Seq_Var_Base_T<T> &); - ~TAO_Seq_Var_Base_T (void); + ~TAO_Seq_Var_Base_T (); - T *operator-> (void); - const T *operator-> (void) const; + T *operator-> (); + const T *operator-> () const; operator const T & () const; operator T & (); @@ -53,13 +53,13 @@ public: typedef T * _retn_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); /// TAO extension. - _retn_type ptr (void) const; + _retn_type ptr () const; protected: T * ptr_; @@ -78,7 +78,7 @@ public: typedef typename T::subscript_type T_elem; typedef typename T::const_subscript_type T_const_elem; - TAO_FixedSeq_Var_T (void); + TAO_FixedSeq_Var_T (); TAO_FixedSeq_Var_T (T *); TAO_FixedSeq_Var_T (const TAO_FixedSeq_Var_T<T> &); @@ -108,7 +108,7 @@ public: typedef typename T::subscript_type T_elem; typedef typename T::const_subscript_type T_const_elem; - TAO_VarSeq_Var_T (void); + TAO_VarSeq_Var_T (); TAO_VarSeq_Var_T (T *); TAO_VarSeq_Var_T (const TAO_VarSeq_Var_T<T> &); diff --git a/TAO/tao/ServerRequestInterceptor_Adapter.h b/TAO/tao/ServerRequestInterceptor_Adapter.h index 9c2c354d595..d4d36949cad 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter.h @@ -66,7 +66,7 @@ namespace TAO : public RequestInterceptor_Adapter { public: - virtual ~ServerRequestInterceptor_Adapter (void); + virtual ~ServerRequestInterceptor_Adapter (); /** * @name PortableInterceptor Server Side Interception Points @@ -153,7 +153,7 @@ namespace TAO PortableInterceptor::ServerRequestInterceptor_ptr interceptor, const CORBA::PolicyList& policies) = 0; - virtual TAO::PICurrent_Impl *allocate_pi_current (void) = 0; + virtual TAO::PICurrent_Impl *allocate_pi_current () = 0; virtual void deallocate_pi_current (TAO::PICurrent_Impl *picurrent) = 0; diff --git a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h index 9f0337c6e67..945ef4c9163 100644 --- a/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h +++ b/TAO/tao/ServerRequestInterceptor_Adapter_Factory.h @@ -38,9 +38,9 @@ class TAO_Export TAO_ServerRequestInterceptor_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_ServerRequestInterceptor_Adapter_Factory (void); + virtual ~TAO_ServerRequestInterceptor_Adapter_Factory (); - virtual TAO::ServerRequestInterceptor_Adapter * create (void) = 0; + virtual TAO::ServerRequestInterceptor_Adapter * create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Server_Strategy_Factory.h b/TAO/tao/Server_Strategy_Factory.h index c168c92acea..88a4491ffa6 100644 --- a/TAO/tao/Server_Strategy_Factory.h +++ b/TAO/tao/Server_Strategy_Factory.h @@ -49,7 +49,7 @@ public: struct Active_Object_Map_Creation_Parameters { /// Constructor. - Active_Object_Map_Creation_Parameters (void); + Active_Object_Map_Creation_Parameters (); /// Default size of object lookup table. CORBA::ULong active_object_map_size_; @@ -85,10 +85,10 @@ public: }; /// Constructor. - TAO_Server_Strategy_Factory (void); + TAO_Server_Strategy_Factory (); /// Destructor. - virtual ~TAO_Server_Strategy_Factory(void); + virtual ~TAO_Server_Strategy_Factory(); /** * Call <open> on various strategies. This is not performed in @@ -99,7 +99,7 @@ public: virtual int open (TAO_ORB_Core* orb_core) = 0; /// Are server connections active (i.e. run in their own thread) - virtual int activate_server_connections (void) = 0; + virtual int activate_server_connections () = 0; /** * Obtain the timeout value used by the thread-per-connection server @@ -111,13 +111,13 @@ public: virtual int thread_per_connection_timeout (ACE_Time_Value &timeout) = 0; /// The thread activation parameters - virtual int server_connection_thread_flags (void) = 0; - virtual int server_connection_thread_count (void) = 0; + virtual int server_connection_thread_flags () = 0; + virtual int server_connection_thread_count () = 0; /// Return the active object map creation parameters. virtual const Active_Object_Map_Creation_Parameters & - active_object_map_creation_parameters (void) const; + active_object_map_creation_parameters () const; protected: /// Active object map creation parameters. diff --git a/TAO/tao/Service_Callbacks.h b/TAO/tao/Service_Callbacks.h index 1fd5c281e78..5eddb99847f 100644 --- a/TAO/tao/Service_Callbacks.h +++ b/TAO/tao/Service_Callbacks.h @@ -67,7 +67,7 @@ public: }; /// Dtor - virtual ~TAO_Service_Callbacks (void); + virtual ~TAO_Service_Callbacks (); /// Select the profile from MProfile as the needs of the services /// may be. Return the profile in @a pfile diff --git a/TAO/tao/Service_Context.h b/TAO/tao/Service_Context.h index 6232de26ba3..fc1668c4125 100644 --- a/TAO/tao/Service_Context.h +++ b/TAO/tao/Service_Context.h @@ -64,7 +64,7 @@ public: friend class TAO::CSD::FW_Server_Request_Wrapper; /// Constructor - TAO_Service_Context (void); + TAO_Service_Context (); /// = Generic components @@ -118,12 +118,12 @@ public: int decode (TAO_InputCDR& cdr); /// Return the underlying service context list - IOP::ServiceContextList &service_info (void); + IOP::ServiceContextList &service_info (); /// @note This method is only for backward comptiblity. We /// need to get this removed once RT folks have their service /// addition info done through this interface - const IOP::ServiceContextList &service_info (void) const; + const IOP::ServiceContextList &service_info () const; private: /// Helper methods to implement set_context() diff --git a/TAO/tao/Service_Context_Handler_Registry.h b/TAO/tao/Service_Context_Handler_Registry.h index 90295c80123..86277a13fd6 100644 --- a/TAO/tao/Service_Context_Handler_Registry.h +++ b/TAO/tao/Service_Context_Handler_Registry.h @@ -35,7 +35,7 @@ class TAO_Export TAO_Service_Context_Registry public: /// Destructor - ~TAO_Service_Context_Registry (void); + ~TAO_Service_Context_Registry (); /** * Bind a new entry in the registry diff --git a/TAO/tao/Special_Basic_Argument_T.h b/TAO/tao/Special_Basic_Argument_T.h index 03f6ac34ec2..47b72cabd25 100644 --- a/TAO/tao/Special_Basic_Argument_T.h +++ b/TAO/tao/Special_Basic_Argument_T.h @@ -43,7 +43,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; protected: S const & x_; @@ -63,9 +63,9 @@ namespace TAO { public: In_Special_Basic_Clonable_Argument_T (S const &); - virtual ~In_Special_Basic_Clonable_Argument_T (void); + virtual ~In_Special_Basic_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -90,7 +90,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -114,7 +114,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S & x_; @@ -132,16 +132,16 @@ namespace TAO class Ret_Special_Basic_Argument_T : public RetArgument { public: - Ret_Special_Basic_Argument_T (void); + Ret_Special_Basic_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); - S excp (void); - S retn (void); + S excp (); + S retn (); private: S x_; diff --git a/TAO/tao/String_Const_Sequence_Element_T.h b/TAO/tao/String_Const_Sequence_Element_T.h index d9837cfdee1..d0a2d3c9f1d 100644 --- a/TAO/tao/String_Const_Sequence_Element_T.h +++ b/TAO/tao/String_Const_Sequence_Element_T.h @@ -51,7 +51,7 @@ public: return *this->element_; } - inline const character_type *in (void) const + inline const character_type *in () const { return *this->element_; } diff --git a/TAO/tao/String_Manager_T.h b/TAO/tao/String_Manager_T.h index 2a596187c52..9a0905bff57 100644 --- a/TAO/tao/String_Manager_T.h +++ b/TAO/tao/String_Manager_T.h @@ -39,7 +39,7 @@ public: typedef TAO::details::string_traits_base <charT> s_traits; /// Default CTOR will initialize the underlying ptr_ to empty string. - inline String_Manager_T (void) : ptr_ (s_traits::default_initializer()) + inline String_Manager_T () : ptr_ (s_traits::default_initializer()) { } @@ -56,7 +56,7 @@ public: } /// Destructor - inline ~String_Manager_T (void) { + inline ~String_Manager_T () { s_traits::release (this->ptr_); } @@ -101,24 +101,24 @@ public: } /// For in parameter. - inline const character_type *in (void) const { + inline const character_type *in () const { return this->ptr_; } /// For inout parameter. - inline character_type *&inout (void) { + inline character_type *&inout () { return this->ptr_; } /// for out parameter. - inline character_type *&out (void) { + inline character_type *&out () { s_traits::release (this->ptr_); this->ptr_ = 0; return this->ptr_; } /// For string of return type. - inline character_type *_retn (void) { + inline character_type *_retn () { character_type *temp = this->ptr_; this->ptr_ = 0; return temp; diff --git a/TAO/tao/String_Sequence_Element_T.h b/TAO/tao/String_Sequence_Element_T.h index b408e1c1685..1905bba57ad 100644 --- a/TAO/tao/String_Sequence_Element_T.h +++ b/TAO/tao/String_Sequence_Element_T.h @@ -96,15 +96,15 @@ public: return *this->element_; } - inline const character_type *in (void) const { + inline const character_type *in () const { return *this->element_; } - inline character_type *&inout (void) const { + inline character_type *&inout () const { return *this->element_; } - inline string_out out (void) const { + inline string_out out () const { if (release()) { @@ -114,7 +114,7 @@ public: return *this->element_; } - inline character_type *_retn (void) { + inline character_type *_retn () { character_type * copy = *this->element_; *this->element_ = traits::default_initializer(); return copy; diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index a2b56708493..9f31b1b878c 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -89,7 +89,7 @@ public: /// Return the queueing strategy to be used in by the transport. /// Selection will be based on the SyncScope policies. - TAO::Transport_Queueing_Strategy *transport_queueing_strategy (void); + TAO::Transport_Queueing_Strategy *transport_queueing_strategy (); /// All objref representations carry around a type ID. CORBA::String_var type_id; @@ -114,39 +114,39 @@ public: TAO_ORB_Core *orb_core); // = Memory management. - void _incr_refcnt (void); - void _decr_refcnt (void); + void _incr_refcnt (); + void _decr_refcnt (); /// Return the Profile lock. This lock can be used at places where /// profiles need to be edited. - const TAO_SYNCH_MUTEX& profile_lock (void) const; + const TAO_SYNCH_MUTEX& profile_lock () const; /// Manage the base (non-forwarded) profiles. /// Returns a pointer to the profile_in_use object. This object /// retains ownership of this profile. - TAO_Profile *profile_in_use (void); + TAO_Profile *profile_in_use (); /// Return the ObjectKey - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /** * Copy of the profile list, user must free memory when done. * although the user can call make_profiles() then reorder * the list and give it back to TAO_Stub. */ - TAO_MProfile *make_profiles (void); + TAO_MProfile *make_profiles (); /// Obtain a reference to the basic profile set. - const TAO_MProfile& base_profiles (void) const; + const TAO_MProfile& base_profiles () const; /// Obtain a reference to the basic profile set. - TAO_MProfile& base_profiles (void); + TAO_MProfile& base_profiles (); /// Obtain a pointer to the forwarded profile set - const TAO_MProfile *forward_profiles (void) const; + const TAO_MProfile *forward_profiles () const; /// Obtain a pointer to the forwarded profile set - TAO_MProfile *forward_profiles (void); + TAO_MProfile *forward_profiles (); /// True if permanent location forward occurred, in this case the lock must be set and the @@ -159,7 +159,7 @@ public: * profile_in_use_ is set to the first profile in the base_profiles * list. */ - TAO_Profile *next_profile (void); + TAO_Profile *next_profile (); /** * THREAD SAFE @@ -167,23 +167,23 @@ public: * profile and if there are anmy existing forward profiles they are * reset. */ - void reset_profiles (void); + void reset_profiles (); /// Returns true if the profile in use is /// the same as the profile in use after /// reset_profiles() is called. - CORBA::Boolean at_starting_profile (void) const; + CORBA::Boolean at_starting_profile () const; /// Returns true if a forward profile has successfully been used. /// profile_success_ && forward_profiles_ - CORBA::Boolean valid_forward_profile (void); + CORBA::Boolean valid_forward_profile (); /// NON-THREAD-SAFE. Will set profile_success_ to true. - void set_valid_profile (void); + void set_valid_profile (); /// Returns true if a connection was successful with at least /// one profile. - CORBA::Boolean valid_profile (void) const; + CORBA::Boolean valid_profile () const; /// Initialize the base_profiles_ and set profile_in_use_ to /// reference the first profile. @@ -207,22 +207,22 @@ public: * Used to get the next profile after the one being used has * failed during the initial connect or send of the message! */ - CORBA::Boolean next_profile_retry (void); + CORBA::Boolean next_profile_retry (); /// Accessor. - TAO_ORB_Core* orb_core (void) const; + TAO_ORB_Core* orb_core () const; /// Is this stub collocated with the servant? - CORBA::Boolean is_collocated (void) const; + CORBA::Boolean is_collocated () const; /// Mutator to mark this stub as being collocated with the servant. void is_collocated (CORBA::Boolean); /// This returns a duplicated ORB pointer. - CORBA::ORB_ptr servant_orb_ptr (void); + CORBA::ORB_ptr servant_orb_ptr (); /// This returns the ORB var itself (generally for temporary use). - CORBA::ORB_var &servant_orb_var (void); + CORBA::ORB_var &servant_orb_var (); /** * Accesor and mutator for the servant ORB. Notice that the mutator @@ -236,7 +236,7 @@ public: void collocated_servant (TAO_Abstract_ServantBase* servant); /// Accessor for the servant reference in collocated cases. - TAO_Abstract_ServantBase* collocated_servant (void) const; + TAO_Abstract_ServantBase* collocated_servant () const; /// Mutator for setting the object proxy broker pointer. /// CORBA::Objects using this stub will use this for standard calls @@ -246,7 +246,7 @@ public: /// Accessor for getting the object proxy broker pointer. /// CORBA::Objects using this stub use this for standard calls /// like is_a; get_interface; etc... - TAO::Object_Proxy_Broker *object_proxy_broker (void) const; + TAO::Object_Proxy_Broker *object_proxy_broker () const; /** * Create the IOP::IOR info. We will create the info at most once. @@ -259,14 +259,14 @@ public: * This method is intended to be used only by the CORBA::Object * class. */ - void destroy (void); + void destroy (); /// Return the cached value from the ORB_Core. /** * This flag indicates whether the stub code should make use of the * collocation opportunities that are available to the ORB. */ - CORBA::Boolean optimize_collocation_objects (void) const; + CORBA::Boolean optimize_collocation_objects () const; /// Needed to avoid copying forward_profiles for thread safety CORBA::Boolean marshal (TAO_OutputCDR&); @@ -278,13 +278,13 @@ protected: /// Destructor is to be called only through _decr_refcnt() to /// enforce proper reference counting. - virtual ~TAO_Stub (void); + virtual ~TAO_Stub (); /// NON-THREAD SAFE version of reset_profiles (void); - void reset_profiles_i (void); + void reset_profiles_i (); /// NON-THREAD SAFE version of next_profile (void) - TAO_Profile *next_profile_i (void); + TAO_Profile *next_profile_i (); private: /// Makes a copy of the profile and frees the existing profile_in_use. @@ -297,14 +297,14 @@ private: /// NON-THREAD-SAFE. Utility method which unrolls (removes or pops) /// the top most forwarding profile list. - void forward_back_one (void); + void forward_back_one (); /// NOT THREAD-SAFE. Utility method which pops all forward profile /// lists and resets the forward_profiles_ pointer. void reset_forward (); /// NON-THREAD-SAFE. utility method for next_profile. - TAO_Profile *next_forward_profile (void); + TAO_Profile *next_forward_profile (); /// THREAD-SAFE Create the IOR info int get_profile_ior_info (TAO_MProfile &profile, IOP::IOR *&ior_info); @@ -434,12 +434,12 @@ public: explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = 0); TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap); TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs); - ~TAO_Stub_Auto_Ptr (void); + ~TAO_Stub_Auto_Ptr (); // = Accessor methods. TAO_Stub &operator *() const; - TAO_Stub *get (void) const; - TAO_Stub *release (void); + TAO_Stub *get () const; + TAO_Stub *release (); void reset (TAO_Stub *p = 0); TAO_Stub *operator-> () const; diff --git a/TAO/tao/Synch_Invocation.h b/TAO/tao/Synch_Invocation.h index 391955d8752..0637182898c 100644 --- a/TAO/tao/Synch_Invocation.h +++ b/TAO/tao/Synch_Invocation.h @@ -178,7 +178,7 @@ namespace TAO /// The destructor calls Invocation_Base::invoke_status with the /// right invoke status, which is useful for PI's. - ~Reply_Guard (void); + ~Reply_Guard (); /// Mutator to set the invocation status. void set_status (Invocation_Status s); diff --git a/TAO/tao/Synch_Invocation.inl b/TAO/tao/Synch_Invocation.inl index 607b714ce43..c595d17a7c0 100644 --- a/TAO/tao/Synch_Invocation.inl +++ b/TAO/tao/Synch_Invocation.inl @@ -12,7 +12,7 @@ namespace TAO } ACE_INLINE - Reply_Guard::~Reply_Guard (void) + Reply_Guard::~Reply_Guard () { #if TAO_HAS_INTERCEPTORS == 1 this->invocation_->invoke_status (this->status_); diff --git a/TAO/tao/SystemException.h b/TAO/tao/SystemException.h index 937c045e5ad..f52e0414820 100644 --- a/TAO/tao/SystemException.h +++ b/TAO/tao/SystemException.h @@ -55,7 +55,7 @@ namespace CORBA namespace TAO { - typedef CORBA::SystemException* (*excp_factory)(void); + typedef CORBA::SystemException* (*excp_factory)(); } namespace CORBA @@ -99,16 +99,16 @@ namespace CORBA SystemException (const SystemException & src); /// Destructor. - virtual ~SystemException (void); + virtual ~SystemException (); /// Get the minor status. - ULong minor (void) const; + ULong minor () const; /// Set the minor status. void minor (ULong m); /// Get the completion status. - CORBA::CompletionStatus completed (void) const; + CORBA::CompletionStatus completed () const; /// Set the operation completion status. void completed (CORBA::CompletionStatus c); @@ -119,7 +119,7 @@ namespace CORBA /// The const version of narrow operation to a SystemException static const SystemException *_downcast(const CORBA::Exception *exception); - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; // = TAO-specific extension. @@ -129,7 +129,7 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const; + virtual ACE_CString _info () const; virtual void _tao_encode (TAO_OutputCDR &cdr) const; @@ -143,12 +143,12 @@ namespace CORBA static CORBA::ULong _tao_errno (int errno_value); /// Deep copy - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; protected: /// Default constructor. - SystemException (void); + SystemException (); /// Assignment operator. SystemException & operator= (const SystemException &src); diff --git a/TAO/tao/TAO_Server_Request.h b/TAO/tao/TAO_Server_Request.h index 0c0b15fd96a..db1720972d3 100644 --- a/TAO/tao/TAO_Server_Request.h +++ b/TAO/tao/TAO_Server_Request.h @@ -125,79 +125,79 @@ public: CORBA::Object_ptr target); /// Destructor. - ~TAO_ServerRequest (void); + ~TAO_ServerRequest (); /** * @name Request attributes. */ //@{ /// Return the operation name. - const char *operation (void) const; + const char *operation () const; /// Set the operation name. void operation (const char *operation, size_t length, int release); /// Return the length of the operation. - size_t operation_length (void) const; + size_t operation_length () const; //@} /// Return the underlying ORB. - CORBA::ORB_ptr orb (void); + CORBA::ORB_ptr orb (); /// Return the ORB core pointer member. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Start a Reply message. - void init_reply (void); + void init_reply (); /// Retrieve the incoming stream. - TAO_InputCDR * incoming (void) const; + TAO_InputCDR * incoming () const; /// Retrieve the outgoing stream. - TAO_OutputCDR * outgoing (void) const; + TAO_OutputCDR * outgoing () const; /// Is the response expected? - CORBA::Boolean response_expected (void) const; + CORBA::Boolean response_expected () const; /// Should the reply be deferred? - CORBA::Boolean deferred_reply (void) const; + CORBA::Boolean deferred_reply () const; /// Set the response expected flag. void response_expected (CORBA::Boolean response); /// Should we return before dispatching the servant? - CORBA::Boolean sync_with_server (void) const; + CORBA::Boolean sync_with_server () const; /// Set the sync_with_server flag. void sync_with_server (CORBA::Boolean sync_flag); /// Is the request at risk of being queued? - CORBA::Boolean is_queued (void) const; + CORBA::Boolean is_queued () const; /// Set the queued flag. void is_queued (CORBA::Boolean qeueued_flag); /// Send a sync reply if needed after _dispatch is called - void sync_after_dispatch (void); + void sync_after_dispatch (); /// Send a sync reply if needed before _dispatch is called to avoid /// possible queuing first. - void sync_before_dispatch (void); + void sync_before_dispatch (); /// Used with reliable oneway requests. - void send_no_exception_reply (void); + void send_no_exception_reply (); - TAO::ObjectKey &object_key (void); + TAO::ObjectKey &object_key (); /// Return the request TAO_Service_Context - TAO_Service_Context &request_service_context (void); + TAO_Service_Context &request_service_context (); /// Return the reply TAO_Service_Context - TAO_Service_Context &reply_service_context (void); + TAO_Service_Context &reply_service_context (); - IOP::ServiceContextList &reply_service_info (void); + IOP::ServiceContextList &reply_service_info (); - IOP::ServiceContextList &request_service_info (void); + IOP::ServiceContextList &request_service_info (); /// Return the underlying transport TAO_Transport *transport (); @@ -205,7 +205,7 @@ public: /// To handle System Exceptions at the lowest level, a method /// returning the request_id_ is needed. //@{ - CORBA::ULong request_id (void); + CORBA::ULong request_id (); void request_id (CORBA::ULong req); //@} @@ -217,16 +217,16 @@ public: void forward_location (CORBA::Object_ptr forward_reference); /// Get the forward_location. - CORBA::Object_ptr forward_location (void); + CORBA::Object_ptr forward_location (); /** * Since forward location is allowed to be nil then this is a proper * method to check if the request is being forwarded. */ - bool is_forwarded (void) const; + bool is_forwarded () const; /// Get the reply status - GIOP::ReplyStatusType reply_status (void); + GIOP::ReplyStatusType reply_status (); /// Set the reply status void reply_status (GIOP::ReplyStatusType except_type); @@ -235,29 +235,29 @@ public: void requesting_principal (const CORBA::OctetSeq & principal); /// Return the reference to the tagged profile - TAO_Tagged_Profile &profile (void); + TAO_Tagged_Profile &profile (); - void tao_send_reply (void); + void tao_send_reply (); void tao_send_reply_exception (const CORBA::Exception& ex); /// Set the boolean member to true. - void is_dsi (void); + void is_dsi (); /// Set the member. void dsi_nvlist_align (ptrdiff_t alignment); /// Get the operation details for the current request. - TAO_Operation_Details const * operation_details (void) const; + TAO_Operation_Details const * operation_details () const; /// Set the argument_flag void argument_flag (CORBA::Boolean flag); /// Get the argument_flag - CORBA::Boolean argument_flag (void); + CORBA::Boolean argument_flag (); /// Returns @c true if the current request is collocated. - bool collocated (void) const; + bool collocated () const; #if TAO_HAS_INTERCEPTORS == 1 /// Send cached reply. Used in scenarios where the FTORB thinks that @@ -271,12 +271,12 @@ public: * code must be able to modify this value and use that value * at a later time without being forced to use TSS. */ - size_t & interceptor_count (void); + size_t & interceptor_count (); /// Return a reference to the "request scope" PICurrent object. - TAO::PICurrent_Impl *rs_pi_current (void); + TAO::PICurrent_Impl *rs_pi_current (); - CORBA::Exception *caught_exception (void); + CORBA::Exception *caught_exception (); void caught_exception (CORBA::Exception *exception); @@ -284,7 +284,7 @@ public: void pi_reply_status (PortableInterceptor::ReplyStatus s); /// Get the status of the received reply. - PortableInterceptor::ReplyStatus pi_reply_status (void); + PortableInterceptor::ReplyStatus pi_reply_status (); #endif /* TAO_HAS_INTERCEPTORS == 1 */ #if TAO_HAS_ZIOP == 1 @@ -297,7 +297,7 @@ public: private: /// Default ctor only used to create a TAO_ServerRequest that is about /// to be the target of a clone operation. - TAO_ServerRequest (void); + TAO_ServerRequest (); TAO_GIOP_Message_Base *mesg_base_; diff --git a/TAO/tao/TSS_Resources.h b/TAO/tao/TSS_Resources.h index 3339d41b47a..645a612fe9c 100644 --- a/TAO/tao/TSS_Resources.h +++ b/TAO/tao/TSS_Resources.h @@ -47,13 +47,13 @@ class TAO_Export TAO_TSS_Resources public: /// Constructor - TAO_TSS_Resources (void); + TAO_TSS_Resources (); /// Destructor - ~TAO_TSS_Resources (void); + ~TAO_TSS_Resources (); /// Return a singleton instance of this class. - static TAO_TSS_Resources * instance (void); + static TAO_TSS_Resources * instance (); private: diff --git a/TAO/tao/Tagged_Components.h b/TAO/tao/Tagged_Components.h index aab03fea27d..89c4e2ac87d 100644 --- a/TAO/tao/Tagged_Components.h +++ b/TAO/tao/Tagged_Components.h @@ -56,7 +56,7 @@ class TAO_Export TAO_Tagged_Components { public: /// Constructor - TAO_Tagged_Components (void); + TAO_Tagged_Components (); // = Standard OMG that require fast access. /// The the IOP::TAG_ORB_TYPE component value @@ -113,7 +113,7 @@ public: * MutipleComponentProfile. Added by request from Chris Hafey * <chris@stentorsoft.com> */ - IOP::MultipleComponentProfile &components (void); + IOP::MultipleComponentProfile &components (); private: /// Helper method to implement set_code_sets() diff --git a/TAO/tao/Tagged_Profile.h b/TAO/tao/Tagged_Profile.h index d205ead432e..0b41fc1ec9c 100644 --- a/TAO/tao/Tagged_Profile.h +++ b/TAO/tao/Tagged_Profile.h @@ -58,27 +58,27 @@ public: CORBA::Boolean unmarshall_object_key (TAO_InputCDR &cdr); /// Return the object key - TAO::ObjectKey &object_key (void); + TAO::ObjectKey &object_key (); /// Save the object key void object_key (TAO::ObjectKey &object_key); /// Return a const object key - const TAO::ObjectKey &object_key (void) const; + const TAO::ObjectKey &object_key () const; /// Get the tagged_profile - const IOP::TaggedProfile &tagged_profile (void) const; + const IOP::TaggedProfile &tagged_profile () const; /// Get the profile index, that needs to be used in the /// sequnce of TaggedProfiles contained IOP::IOR that is /// received from the client. - CORBA::ULong profile_index (void) const; + CORBA::ULong profile_index () const; /// Accessor to the type_id contained in the IOP::IOR received from /// the client. - const char* type_id (void) const; + const char* type_id () const; - CORBA::Short discriminator (void) const; + CORBA::Short discriminator () const; private: /// Extract the object key from the TaggedProfile and store it in diff --git a/TAO/tao/Thread_Lane_Resources.h b/TAO/tao/Thread_Lane_Resources.h index 1ae4954e843..eed52ccf519 100644 --- a/TAO/tao/Thread_Lane_Resources.h +++ b/TAO/tao/Thread_Lane_Resources.h @@ -55,7 +55,7 @@ public: TAO_New_Leader_Generator *new_leader_generator = 0); /// Destructor. - ~TAO_Thread_Lane_Resources (void); + ~TAO_Thread_Lane_Resources (); /// Does @a mprofile belong to us? int is_collocated (const TAO_MProfile &mprofile); @@ -65,94 +65,94 @@ public: bool ignore_address); /// Finalize resources. - void finalize (void); + void finalize (); /// Shutdown the reactor. - void shutdown_reactor (void); + void shutdown_reactor (); /// Certain ORB policies such as dropping replies on shutdown /// would need cleanup of transports to wake threads up. - void close_all_transports (void); + void close_all_transports (); /// @name Accessors //@{ - TAO_Acceptor_Registry &acceptor_registry (void); + TAO_Acceptor_Registry &acceptor_registry (); /** * @note Returning a pointer helps to return 0 in case of * exceptions. */ - TAO_Connector_Registry *connector_registry (void); + TAO_Connector_Registry *connector_registry (); /// Get the transport cache - TAO::Transport_Cache_Manager &transport_cache (void); + TAO::Transport_Cache_Manager &transport_cache (); - TAO_Leader_Follower &leader_follower (void); + TAO_Leader_Follower &leader_follower (); /** * Allocator is intended for allocating the ACE_Data_Blocks used in * incoming CDR streams. This allocator has locks. */ - ACE_Allocator *input_cdr_dblock_allocator (void); + ACE_Allocator *input_cdr_dblock_allocator (); /** * Allocator is intended for allocating the buffers in the incoming * CDR streams. This allocator has locks. */ - ACE_Allocator *input_cdr_buffer_allocator (void); + ACE_Allocator *input_cdr_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Message_Blocks used * in incoming CDR streams. This allocator is global, and has locks. */ - ACE_Allocator *input_cdr_msgblock_allocator (void); + ACE_Allocator *input_cdr_msgblock_allocator (); /** * Allocator is intended for allocating the buffers used in the * Transport object. This allocator has locks. */ - ACE_Allocator *transport_message_buffer_allocator (void); + ACE_Allocator *transport_message_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Data_Blocks used in * outgoing CDR streams. This allocator has locks. */ - ACE_Allocator *output_cdr_dblock_allocator (void); + ACE_Allocator *output_cdr_dblock_allocator (); /** * Allocator is intended for allocating the buffers in the outgoing * CDR streams. This allocator has locks. */ - ACE_Allocator *output_cdr_buffer_allocator (void); + ACE_Allocator *output_cdr_buffer_allocator (); /** * Allocator is intended for allocating the ACE_Message_Blocks used * in the outgoing CDR streams. This allocator is global, and has * locks. */ - ACE_Allocator *output_cdr_msgblock_allocator (void); + ACE_Allocator *output_cdr_msgblock_allocator (); /** * Allocator is intended for allocating the AMH response handlers * This allocator is global. */ - ACE_Allocator *amh_response_handler_allocator (void); + ACE_Allocator *amh_response_handler_allocator (); /** * Allocator is intended for allocating the AMI response handlers * This allocator is global. */ - ACE_Allocator *ami_response_handler_allocator (void); + ACE_Allocator *ami_response_handler_allocator (); //@} private: /// Checks if the acceptor registry has been created. - int has_acceptor_registry_been_created (void) const; + int has_acceptor_registry_been_created () const; /// Helper to get the resource factory in the ORB_Core - TAO_Resource_Factory *resource_factory (void); + TAO_Resource_Factory *resource_factory (); private: /// ORB_Core related to this thread lane. diff --git a/TAO/tao/Thread_Lane_Resources_Manager.h b/TAO/tao/Thread_Lane_Resources_Manager.h index a67e1f104e3..eb9f72a05f6 100644 --- a/TAO/tao/Thread_Lane_Resources_Manager.h +++ b/TAO/tao/Thread_Lane_Resources_Manager.h @@ -43,30 +43,30 @@ public: TAO_Thread_Lane_Resources_Manager (TAO_ORB_Core &orb_core); /// Destructor. - virtual ~TAO_Thread_Lane_Resources_Manager (void); + virtual ~TAO_Thread_Lane_Resources_Manager (); /// Finalize resources. - virtual void finalize (void) = 0; + virtual void finalize () = 0; /// Open default resources. - virtual int open_default_resources (void) = 0; + virtual int open_default_resources () = 0; /// Shutdown reactor. - virtual void shutdown_reactor (void) = 0; + virtual void shutdown_reactor () = 0; /// Cleanup transports to wake threads up waiting on those sockets. - virtual void close_all_transports (void) = 0; + virtual void close_all_transports () = 0; /// Does @a mprofile belong to us? virtual int is_collocated (const TAO_MProfile& mprofile) = 0; /// @name Accessors // @{ - virtual TAO_Thread_Lane_Resources &lane_resources (void) = 0; + virtual TAO_Thread_Lane_Resources &lane_resources () = 0; - virtual TAO_Thread_Lane_Resources &default_lane_resources (void) = 0; + virtual TAO_Thread_Lane_Resources &default_lane_resources () = 0; - TAO_LF_Strategy &lf_strategy (void); + TAO_LF_Strategy &lf_strategy (); // @} private: @@ -94,7 +94,7 @@ class TAO_Export TAO_Thread_Lane_Resources_Manager_Factory { public: /// Virtual destructor. - virtual ~TAO_Thread_Lane_Resources_Manager_Factory (void); + virtual ~TAO_Thread_Lane_Resources_Manager_Factory (); /// Factory method. virtual TAO_Thread_Lane_Resources_Manager * diff --git a/TAO/tao/Transport.h b/TAO/tao/Transport.h index f97848540da..4b3c84d069d 100644 --- a/TAO/tao/Transport.h +++ b/TAO/tao/Transport.h @@ -321,7 +321,7 @@ public: size_t input_cdr_size = ACE_CDR::DEFAULT_BUFSIZE); /// Destructor - virtual ~TAO_Transport (void); + virtual ~TAO_Transport (); /// Return the protocol tag. /** @@ -329,10 +329,10 @@ public: * protocol. New protocol tags can be obtained free of charge from * the OMG, check the documents in corbafwd.h for more details. */ - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Access the ORB that owns this connection. - TAO_ORB_Core *orb_core (void) const; + TAO_ORB_Core *orb_core () const; /// Get the TAO_Tranport_Mux_Strategy used by this object. /** @@ -345,7 +345,7 @@ public: * connection is more efficient and reduces the possibilities of * priority inversions. */ - TAO_Transport_Mux_Strategy *tms (void) const; + TAO_Transport_Mux_Strategy *tms () const; /// Return the TAO_Wait_Strategy used by this object. /** @@ -355,7 +355,7 @@ public: * multiple events concurrently or using the Leader/Followers * protocol. */ - TAO_Wait_Strategy *wait_strategy (void) const; + TAO_Wait_Strategy *wait_strategy () const; enum Drain_Result_Enum { @@ -388,7 +388,7 @@ public: Drain_Result handle_output (TAO::Transport::Drain_Constraints const & c); /// Get the bidirectional flag - int bidirectional_flag (void) const; + int bidirectional_flag () const; /// Set the bidirectional flag void bidirectional_flag (int flag); @@ -397,7 +397,7 @@ public: void cache_map_entry (TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *entry); /// Get the Cache Map entry - TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (void); + TAO::Transport_Cache_Manager::HASH_MAP_ENTRY *cache_map_entry (); /// Set and Get the identifier for this transport instance. /** @@ -405,29 +405,29 @@ public: * the <code>this</code> pointer for the instance on which * it's called. */ - size_t id (void) const; + size_t id () const; void id (size_t id); /** * Methods dealing with the role of the connection, e.g., CLIENT or SERVER. * See CORBA 2.6 Specification, Section 15.5.1 for origin of definitions. */ - TAO::Connection_Role opened_as (void) const; + TAO::Connection_Role opened_as () const; void opened_as (TAO::Connection_Role); /// Get and Set the purging order. The purging strategy uses the set /// version to set the purging order. - unsigned long purging_order (void) const; + unsigned long purging_order () const; void purging_order(unsigned long value); /// Check if there are messages pending in the queue /** * @return true if the queue is empty */ - bool queue_is_empty (void); + bool queue_is_empty (); /// Register with the reactor via the wait strategy - bool register_if_necessary (void); + bool register_if_necessary (); /// Added event handler to the handlers set. @@ -465,10 +465,10 @@ public: * thread-per-connection mode. In that case putting the connection * in the Reactor would produce unpredictable results anyway. */ - virtual int register_handler (void); + virtual int register_handler (); /// Remove the handler from the reactor. - virtual int remove_handler (void); + virtual int remove_handler (); /// Write the complete Message_Block chain to the connection. /** @@ -553,14 +553,14 @@ public: /// Request has been just sent, but the reply is not received. Idle /// the transport now. - bool idle_after_send (void); + bool idle_after_send (); /// Request is sent and the reply is received. Idle the transport /// now. - bool idle_after_reply (void); + bool idle_after_reply (); /// Call the implementation method after obtaining the lock. - virtual void close_connection (void); + virtual void close_connection (); //@} /** @name Template methods @@ -594,18 +594,18 @@ public: * * @note The methods are not made const with a reason. */ - virtual bool post_connect_hook (void); + virtual bool post_connect_hook (); /// Memory management routines. /** * Forwards to event handler. */ - ACE_Event_Handler::Reference_Count add_reference (void); - ACE_Event_Handler::Reference_Count remove_reference (void); + ACE_Event_Handler::Reference_Count add_reference (); + ACE_Event_Handler::Reference_Count remove_reference (); /// Return the messaging object that is used to format the data that /// needs to be sent. - TAO_GIOP_Message_Base * messaging_object (void); + TAO_GIOP_Message_Base * messaging_object (); /** @name Template methods * @@ -633,36 +633,36 @@ public: * * @todo This method has to be renamed to event_handler() */ - virtual ACE_Event_Handler * event_handler_i (void) = 0; + virtual ACE_Event_Handler * event_handler_i () = 0; /// Is this transport really connected - bool is_connected (void) const; + bool is_connected () const; /// Was a connection seen as closed during a read - bool connection_closed_on_read (void) const; + bool connection_closed_on_read () const; /// Perform all the actions when this transport get opened bool post_open (size_t id); /// do what needs to be done when closing the transport - void pre_close (void); + void pre_close (); /// Get the connection handler for this transport - TAO_Connection_Handler * connection_handler (void); + TAO_Connection_Handler * connection_handler (); /// Accessor for the output CDR stream - TAO_OutputCDR &out_stream (void); + TAO_OutputCDR &out_stream (); /// Accessor for synchronizing Transport OutputCDR access - TAO_SYNCH_MUTEX &output_cdr_lock (void); + TAO_SYNCH_MUTEX &output_cdr_lock (); /// Can the transport be purged? - bool can_be_purged (void); + bool can_be_purged (); virtual void set_bidir_context_info (TAO_Operation_Details &opdetails); protected: - virtual TAO_Connection_Handler * connection_handler_i (void) = 0; + virtual TAO_Connection_Handler * connection_handler_i () = 0; public: /// This is a request for the transport object to write a @@ -828,13 +828,13 @@ public: TAO::Transport::Drain_Constraints const & dc); /// Cache management - int purge_entry (void); + int purge_entry (); /// Cache management - int make_idle (void); + int make_idle (); /// Cache management - int update_transport (void); + int update_transport (); /// The timeout callback, invoked when any of the timers related to /// this transport expire. @@ -856,16 +856,16 @@ public: int handle_timeout (const ACE_Time_Value ¤t_time, const void* act); /// Accessor to recv_buffer_size_ - size_t recv_buffer_size (void) const; + size_t recv_buffer_size () const; /// Accessor to sent_byte_count_ - size_t sent_byte_count (void) const; + size_t sent_byte_count () const; /// CodeSet Negotiation - Get the char codeset translator factory - TAO_Codeset_Translator_Base *char_translator (void) const; + TAO_Codeset_Translator_Base *char_translator () const; /// CodeSet Negotiation - Get the wchar codeset translator factory - TAO_Codeset_Translator_Base *wchar_translator (void) const; + TAO_Codeset_Translator_Base *wchar_translator () const; /// CodeSet negotiation - Set the char codeset translator factory void char_translator (TAO_Codeset_Translator_Base *); @@ -893,14 +893,14 @@ public: /// Notify all the components inside a Transport when the underlying /// connection is closed. - void send_connection_closed_notifications (void); + void send_connection_closed_notifications (); /// Transport statistics - TAO::Transport::Stats* stats (void) const; + TAO::Transport::Stats* stats () const; private: /// Helper method that returns the Transport Cache Manager. - TAO::Transport_Cache_Manager &transport_cache_manager (void); + TAO::Transport_Cache_Manager &transport_cache_manager (); /// Send some of the data in the queue. /** @@ -919,7 +919,7 @@ private: * * @return true if the queue is empty */ - bool queue_is_empty_i (void) const; + bool queue_is_empty_i () const; /// A helper routine used in drain_queue_i() Drain_Result drain_queue_helper (int &iovcnt, iovec iov[], @@ -936,10 +936,10 @@ private: friend class TAO_Thread_Per_Connection_Handler; /// Schedule handle_output() callbacks - int schedule_output_i (void); + int schedule_output_i (); /// Cancel handle_output() callbacks - int cancel_output_i (void); + int cancel_output_i (); /// Cleanup the queue. /** @@ -979,11 +979,11 @@ private: ACE_Time_Value *max_wait_time); /// Check if the flush timer is still pending - int flush_timer_pending (void) const; + int flush_timer_pending () const; /// The flush timer expired or was explicitly cancelled, mark it as /// not pending - void reset_flush_timer (void); + void reset_flush_timer (); /// Print out error messages if the event handler is not valid void report_invalid_event_handler (const char *caller); @@ -1026,25 +1026,25 @@ private: * This call prepares a new handler for the notify call and sends a * notify () call to the reactor. */ - int notify_reactor (void); + int notify_reactor (); protected: /* * Same as notify_reactor above but does NOT first check for a * registered TAO_Wait_Strategy. */ - int notify_reactor_now (void); + int notify_reactor_now (); private: ACE_UNIMPLEMENTED_FUNC (TAO_Transport (const TAO_Transport &)) ACE_UNIMPLEMENTED_FUNC (TAO_Transport &operator= (const TAO_Transport &)) /// Assume the lock is held - void send_connection_closed_notifications_i (void); + void send_connection_closed_notifications_i (); /// Allocate a partial message block and store it in our /// partial_message_ data member. - void allocate_partial_message_block (void); + void allocate_partial_message_block (); /** * Return true if blocking I/O should be used for sending synchronous @@ -1251,15 +1251,15 @@ namespace TAO virtual ~Stats (); void messages_sent (size_t message_length); - CORBA::LongLong messages_sent (void) const; - CORBA::LongLong bytes_sent (void) const; + CORBA::LongLong messages_sent () const; + CORBA::LongLong bytes_sent () const; void messages_received (size_t message_length); - CORBA::LongLong messages_received (void) const; - CORBA::LongLong bytes_received (void) const; + CORBA::LongLong messages_received () const; + CORBA::LongLong bytes_received () const; void opened_since (const ACE_Time_Value& tv); - const ACE_Time_Value& opened_since (void) const; + const ACE_Time_Value& opened_since () const; private: /// Mutex guarding the internal state of the statistics diff --git a/TAO/tao/Transport_Acceptor.h b/TAO/tao/Transport_Acceptor.h index 1d8ba921d3f..87d660aa4c9 100644 --- a/TAO/tao/Transport_Acceptor.h +++ b/TAO/tao/Transport_Acceptor.h @@ -76,10 +76,10 @@ public: TAO_Acceptor (CORBA::ULong tag); /// Destructor - virtual ~TAO_Acceptor (void); + virtual ~TAO_Acceptor (); /// The tag, each concrete class will have a specific tag value. - CORBA::ULong tag (void) const; + CORBA::ULong tag () const; /// Set the amount of time to delay accepting new connections in the /// event that we encounter an error that may be transient. @@ -104,7 +104,7 @@ public: const char *options = 0) = 0; /// Closes the acceptor - virtual int close (void) = 0; + virtual int close () = 0; /** * Create the corresponding profile for this endpoint. @@ -125,7 +125,7 @@ public: * is used for determining how many profiles will be generated * for this acceptor. */ - virtual CORBA::ULong endpoint_count (void) = 0; + virtual CORBA::ULong endpoint_count () = 0; /** * This method fetches the @a key from the @a profile. Protocols that @@ -173,7 +173,7 @@ public: { } - virtual int handle_accept_error (void) + virtual int handle_accept_error () { return this->acceptor_->handle_accept_error (this); } diff --git a/TAO/tao/Transport_Cache_Manager_T.cpp b/TAO/tao/Transport_Cache_Manager_T.cpp index 868bd41cd97..ab7a56adf36 100644 --- a/TAO/tao/Transport_Cache_Manager_T.cpp +++ b/TAO/tao/Transport_Cache_Manager_T.cpp @@ -73,7 +73,7 @@ namespace TAO } template <typename TT, typename TRDT, typename PSTRAT> - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::~Transport_Cache_Manager_T (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::~Transport_Cache_Manager_T () { delete this->cache_lock_; this->cache_lock_ = 0; @@ -561,7 +561,7 @@ namespace TAO template <typename TT, typename TRDT, typename PSTRAT> int - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::purge () { typedef ACE_Unbounded_Set<transport_type*> transport_set_type; transport_set_type transports_to_be_closed; diff --git a/TAO/tao/Transport_Cache_Manager_T.h b/TAO/tao/Transport_Cache_Manager_T.h index a61759c9398..7cc7c188264 100644 --- a/TAO/tao/Transport_Cache_Manager_T.h +++ b/TAO/tao/Transport_Cache_Manager_T.h @@ -101,7 +101,7 @@ namespace TAO const char *orbid); /// Destructor - ~Transport_Cache_Manager_T (void); + ~Transport_Cache_Manager_T (); /// Add the transport to the cache. /** @@ -122,7 +122,7 @@ namespace TAO size_t & busy_count); /// Remove entries from the cache depending upon the strategy. - int purge (void); + int purge (); /// Purge the entry from the Cache Map int purge_entry (HASH_MAP_ENTRY *& entry); @@ -158,13 +158,13 @@ namespace TAO bool blockable_client_transports (Connection_Handler_Set &handlers); /// Return the current size of the cache. - size_t current_size (void) const; + size_t current_size () const; /// Return the total size of the cache. - size_t total_size (void) const; + size_t total_size () const; /// Return the underlying cache map - HASH_MAP &map (void); + HASH_MAP &map (); private: /// Lookup entry<key,value> in the cache. Grabs the lock and calls the diff --git a/TAO/tao/Transport_Cache_Manager_T.inl b/TAO/tao/Transport_Cache_Manager_T.inl index 9c4e8c8ef0c..65ceaddfd57 100644 --- a/TAO/tao/Transport_Cache_Manager_T.inl +++ b/TAO/tao/Transport_Cache_Manager_T.inl @@ -137,21 +137,21 @@ namespace TAO template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE size_t - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::current_size (void) const + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::current_size () const { return this->cache_map_.current_size (); } template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE size_t - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::total_size (void) const + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::total_size () const { return this->cache_map_.total_size (); } template <typename TT, typename TRDT, typename PSTRAT> ACE_INLINE typename Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::HASH_MAP & - Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::map (void) + Transport_Cache_Manager_T<TT, TRDT, PSTRAT>::map () { return this->cache_map_; } diff --git a/TAO/tao/Transport_Mux_Strategy.h b/TAO/tao/Transport_Mux_Strategy.h index 092ffff1cec..301f9bc496c 100644 --- a/TAO/tao/Transport_Mux_Strategy.h +++ b/TAO/tao/Transport_Mux_Strategy.h @@ -41,11 +41,11 @@ public: TAO_Transport_Mux_Strategy (TAO_Transport *transport); /// Base class destructor. - virtual ~TAO_Transport_Mux_Strategy (void); + virtual ~TAO_Transport_Mux_Strategy (); /// Generate and return an unique request id for the current /// invocation. - virtual CORBA::ULong request_id (void) = 0; + virtual CORBA::ULong request_id () = 0; /// Bind the dispatcher with the request id. Commonalities in the /// derived class implementations is kept here. @@ -73,19 +73,19 @@ public: /// Request has been just sent, but the reply is not received. Idle /// the transport now. The return value indicates whether idling was /// successful or not. - virtual bool idle_after_send (void) = 0; + virtual bool idle_after_send () = 0; /// Request is sent and the reply is received. Idle the transport /// now. The return value indicates whether idling was successful or /// not. - virtual bool idle_after_reply (void) = 0; + virtual bool idle_after_reply () = 0; /// The transport object has closed the connection, inform all Reply /// dispatchers and waiting strategies. - virtual void connection_closed (void) = 0; + virtual void connection_closed () = 0; /// Do we have a request pending - virtual bool has_request (void) = 0; + virtual bool has_request () = 0; protected: /// Cache the transport reference. diff --git a/TAO/tao/Transport_Queueing_Strategies.h b/TAO/tao/Transport_Queueing_Strategies.h index b145ba57988..45a8dda4a6c 100644 --- a/TAO/tao/Transport_Queueing_Strategies.h +++ b/TAO/tao/Transport_Queueing_Strategies.h @@ -48,7 +48,7 @@ namespace TAO { public: /// Destructor - virtual ~Transport_Queueing_Strategy (void); + virtual ~Transport_Queueing_Strategy (); /// Return true if a message must be queued virtual bool must_queue (bool queue_empty) const = 0; diff --git a/TAO/tao/Transport_Selection_Guard.h b/TAO/tao/Transport_Selection_Guard.h index fbc520aea4e..fa70136f350 100644 --- a/TAO/tao/Transport_Selection_Guard.h +++ b/TAO/tao/Transport_Selection_Guard.h @@ -64,22 +64,22 @@ namespace TAO Transport_Selection_Guard (TAO_Transport* t); /// Dtor - ~Transport_Selection_Guard (void); + ~Transport_Selection_Guard (); /// getter - TAO_Transport* operator-> (void) const + TAO_Transport* operator-> () const { return this->get (); }; /// getter - TAO_Transport& operator* (void) const + TAO_Transport& operator* () const { return *this->get (); }; /// Getter - TAO_Transport* get (void) const + TAO_Transport* get () const { return this->curr_; }; diff --git a/TAO/tao/TypeCodeFactory_Adapter.h b/TAO/tao/TypeCodeFactory_Adapter.h index 6091692a48b..2f065c382d6 100644 --- a/TAO/tao/TypeCodeFactory_Adapter.h +++ b/TAO/tao/TypeCodeFactory_Adapter.h @@ -64,7 +64,7 @@ namespace TAO class TAO_Export TAO_TypeCodeFactory_Adapter : public ACE_Service_Object { public: - virtual ~TAO_TypeCodeFactory_Adapter (void); + virtual ~TAO_TypeCodeFactory_Adapter (); virtual CORBA::TypeCode_ptr create_struct_tc ( const char *id, diff --git a/TAO/tao/UB_String_Argument_T.h b/TAO/tao/UB_String_Argument_T.h index fb5f23cb076..5221d90c31f 100644 --- a/TAO/tao/UB_String_Argument_T.h +++ b/TAO/tao/UB_String_Argument_T.h @@ -42,7 +42,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - const typename S_var::s_traits::char_type * arg (void) const; + const typename S_var::s_traits::char_type * arg () const; protected: typename S_var::s_traits::char_type const * x_; @@ -61,9 +61,9 @@ namespace TAO { public: In_UB_String_Clonable_Argument_T (const typename S_var::s_traits::char_type * x); - virtual ~In_UB_String_Clonable_Argument_T (void); + virtual ~In_UB_String_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -87,7 +87,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type *& arg (void); + typename S_var::s_traits::char_type *& arg (); private: typename S_var::s_traits::char_type *& x_; @@ -110,7 +110,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type *& arg (void); + typename S_var::s_traits::char_type *& arg (); private: typename S_var::s_traits::char_type *& x_; @@ -127,15 +127,15 @@ namespace TAO class Ret_UB_String_Argument_T : public RetArgument { public: - Ret_UB_String_Argument_T (void); + Ret_UB_String_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - typename S_var::s_traits::char_type *& arg (void); - typename S_var::s_traits::char_type * excp (void); - typename S_var::s_traits::char_type * retn (void); + typename S_var::s_traits::char_type *& arg (); + typename S_var::s_traits::char_type * excp (); + typename S_var::s_traits::char_type * retn (); private: S_var x_; diff --git a/TAO/tao/Unbounded_Octet_Sequence_T.h b/TAO/tao/Unbounded_Octet_Sequence_T.h index c3ec3ec5bbd..d50b8b8be03 100644 --- a/TAO/tao/Unbounded_Octet_Sequence_T.h +++ b/TAO/tao/Unbounded_Octet_Sequence_T.h @@ -239,7 +239,7 @@ public: /// Returns the underlying message block, the caller must *not* /// release the copy. - inline ACE_Message_Block* mb (void) const { + inline ACE_Message_Block* mb () const { return mb_; } diff --git a/TAO/tao/UserException.h b/TAO/tao/UserException.h index f2461dd1142..6869abd5a47 100644 --- a/TAO/tao/UserException.h +++ b/TAO/tao/UserException.h @@ -44,7 +44,7 @@ namespace CORBA UserException (UserException const &rhs); /// Destructor. - virtual ~UserException (void); + virtual ~UserException (); /// Assignment operator. UserException &operator= (UserException const &rhs); @@ -55,9 +55,9 @@ namespace CORBA /// The const version of narrow operation static const UserException *_downcast (CORBA::Exception const *exception); - virtual void _raise (void) const = 0; + virtual void _raise () const = 0; - virtual CORBA::TypeCode_ptr _tao_type (void) const; + virtual CORBA::TypeCode_ptr _tao_type () const; // = TAO specific extension. @@ -66,11 +66,11 @@ namespace CORBA /// Returns a string containing information about the exception. This /// function is not CORBA compliant. - virtual ACE_CString _info (void) const; + virtual ACE_CString _info () const; protected: /// Default constructor. - UserException (void); + UserException (); }; } diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index 25a68b6e00a..490ee436614 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -147,12 +147,12 @@ namespace CORBA typedef ACE_Vector < ACE_CString > Repository_Id_List; - virtual CORBA::ValueBase* _copy_value (void) TAO_local_COPY_VALUE_IS_PURE; + virtual CORBA::ValueBase* _copy_value () TAO_local_COPY_VALUE_IS_PURE; // Reference counting. - virtual void _add_ref (void) = 0; - virtual void _remove_ref (void) = 0; - virtual CORBA::ULong _refcount_value (void) = 0; + virtual void _add_ref () = 0; + virtual void _remove_ref () = 0; + virtual CORBA::ULong _refcount_value () = 0; // dynamic casting static CORBA::ValueBase* _downcast (CORBA::ValueBase *); @@ -161,10 +161,10 @@ namespace CORBA /// Used in the implementation of CORBA::Any static void _tao_any_destructor (void *); - virtual CORBA::TypeCode_ptr _tao_type (void) const = 0; + virtual CORBA::TypeCode_ptr _tao_type () const = 0; /// Return the repository id of this valuetype. - virtual const char * _tao_obv_repository_id (void) const = 0; + virtual const char * _tao_obv_repository_id () const = 0; /// Give the list of the RepositoryIds in the valuetype "truncatable" /// inheritance hierarchy. List the id of this valuetype as first @@ -238,9 +238,9 @@ namespace CORBA virtual void truncation_hook (); protected: - ValueBase (void); + ValueBase (); ValueBase (const ValueBase&); - virtual ~ValueBase (void); + virtual ~ValueBase (); /// This flag is set to be true when the valuetype defined /// in the idl has the truncatable parent. @@ -327,18 +327,18 @@ namespace CORBA : public virtual ValueBase { public: - virtual void _add_ref (void); - virtual void _remove_ref (void); - virtual CORBA::ULong _refcount_value (void); + virtual void _add_ref (); + virtual void _remove_ref (); + virtual CORBA::ULong _refcount_value (); /// The _tao variants are inline for fast access from T_var /// (if valuetype T is compiled with optimization for that.) %! (todo) - void _tao_add_ref (void); - void _tao_remove_ref (void); - CORBA::ULong _tao_refcount_value (void) const; + void _tao_add_ref (); + void _tao_remove_ref (); + CORBA::ULong _tao_refcount_value () const; protected: - DefaultValueRefCountBase (void); + DefaultValueRefCountBase (); DefaultValueRefCountBase (const DefaultValueRefCountBase&); virtual ~DefaultValueRefCountBase (); diff --git a/TAO/tao/Valuetype/ValueFactory.h b/TAO/tao/Valuetype/ValueFactory.h index 6003f803086..ba9596b0bdb 100644 --- a/TAO/tao/Valuetype/ValueFactory.h +++ b/TAO/tao/Valuetype/ValueFactory.h @@ -54,21 +54,21 @@ namespace CORBA class TAO_Valuetype_Export ValueFactoryBase { public: - ValueFactoryBase (void); - virtual ~ValueFactoryBase (void); + ValueFactoryBase (); + virtual ~ValueFactoryBase (); // non-virtual is non-standard - void _add_ref (void); - void _remove_ref (void); + void _add_ref (); + void _remove_ref (); // private: %! /// In a derived class T use return type TAO_OBV_CREATE_RETURN_TYPE (T) /// (see at definition below) - virtual CORBA::ValueBase * create_for_unmarshal (void) = 0; + virtual CORBA::ValueBase * create_for_unmarshal () = 0; /// Not pure virtual because this will be overridden only by valuetypes /// that support an abstract interface. - virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (void); + virtual CORBA::AbstractBase_ptr create_for_unmarshal_abstract (); private: /// Reference counter. diff --git a/TAO/tao/Valuetype/Value_VarOut_T.h b/TAO/tao/Valuetype/Value_VarOut_T.h index 07e3818c5f9..0a5e67ec072 100644 --- a/TAO/tao/Valuetype/Value_VarOut_T.h +++ b/TAO/tao/Valuetype/Value_VarOut_T.h @@ -42,19 +42,19 @@ template <typename T> class TAO_Value_Var_T : private TAO_Base_var { public: - TAO_Value_Var_T (void); + TAO_Value_Var_T (); TAO_Value_Var_T (T *); TAO_Value_Var_T (const TAO_Value_Var_T<T> &); // (TAO extension) TAO_Value_Var_T (const T *); - ~TAO_Value_Var_T (void); + ~TAO_Value_Var_T (); TAO_Value_Var_T &operator= (T *); TAO_Value_Var_T &operator= (const TAO_Value_Var_T<T> &); - T * operator-> (void) const; + T * operator-> () const; operator const T * () const; operator T *& (); @@ -65,13 +65,13 @@ public: typedef T * _retn_type; // in, inout, out, _retn - _in_type in (void) const; - _inout_type inout (void); - _out_type out (void); - _retn_type _retn (void); + _in_type in () const; + _inout_type inout (); + _out_type out (); + _retn_type _retn (); // (TAO extension) - T * ptr (void) const; + T * ptr () const; private: @@ -100,9 +100,9 @@ public: TAO_Value_Out_T &operator= (T *); operator T *& (); - T *& ptr (void); + T *& ptr (); - T * operator-> (void); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h index d2c013cf17d..0b8ab48fe36 100644 --- a/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h +++ b/TAO/tao/Valuetype/Valuetype_Adapter_Factory_Impl.h @@ -39,12 +39,12 @@ class TAO_Valuetype_Export TAO_Valuetype_Adapter_Factory_Impl : public TAO_Valuetype_Adapter_Factory { public: - virtual ~TAO_Valuetype_Adapter_Factory_Impl (void); + virtual ~TAO_Valuetype_Adapter_Factory_Impl (); - virtual TAO_Valuetype_Adapter * create (void); + virtual TAO_Valuetype_Adapter * create (); // Used to force the initialization of the ORB code. - static int Initializer (void); + static int Initializer (); }; static const int TAO_Requires_ValueType_Initializer = diff --git a/TAO/tao/Valuetype_Adapter.h b/TAO/tao/Valuetype_Adapter.h index db2f8c8539a..0b2dceb7b4f 100644 --- a/TAO/tao/Valuetype_Adapter.h +++ b/TAO/tao/Valuetype_Adapter.h @@ -51,7 +51,7 @@ class TAO_InputCDR; class TAO_Export TAO_Valuetype_Adapter : public ACE_Service_Object { public: - virtual ~TAO_Valuetype_Adapter (void); + virtual ~TAO_Valuetype_Adapter (); virtual CORBA::Object_ptr abstractbase_to_object ( CORBA::AbstractBase_ptr p) = 0; @@ -63,7 +63,7 @@ public: TAO_InputCDR &, CORBA::AbstractBase_ptr &) = 0; - virtual CORBA::Long type_info_single (void) const = 0; + virtual CORBA::Long type_info_single () const = 0; virtual CORBA::Boolean is_type_info_implied (CORBA::Long) const = 0; virtual CORBA::Boolean is_type_info_single (CORBA::Long) const = 0; diff --git a/TAO/tao/Valuetype_Adapter_Factory.h b/TAO/tao/Valuetype_Adapter_Factory.h index aa3cd1e5b91..3d90b5b5804 100644 --- a/TAO/tao/Valuetype_Adapter_Factory.h +++ b/TAO/tao/Valuetype_Adapter_Factory.h @@ -39,9 +39,9 @@ class TAO_Export TAO_Valuetype_Adapter_Factory : public ACE_Service_Object { public: - virtual ~TAO_Valuetype_Adapter_Factory (void); + virtual ~TAO_Valuetype_Adapter_Factory (); - virtual TAO_Valuetype_Adapter * create (void) = 0; + virtual TAO_Valuetype_Adapter * create () = 0; }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/VarOut_T.h b/TAO/tao/VarOut_T.h index a10d9bbe404..857399b3332 100644 --- a/TAO/tao/VarOut_T.h +++ b/TAO/tao/VarOut_T.h @@ -33,24 +33,24 @@ template<typename T> class TAO_Var_Base_T { public: - TAO_Var_Base_T (void); + TAO_Var_Base_T (); TAO_Var_Base_T (T *); TAO_Var_Base_T (const TAO_Var_Base_T<T> &); - ~TAO_Var_Base_T (void); + ~TAO_Var_Base_T (); - T * operator-> (void); - const T * operator-> (void) const; + T * operator-> (); + const T * operator-> () const; typedef const T & _in_type; typedef T & _inout_type; // Common mapping for fixed and variable size types. - _in_type in (void) const; - _inout_type inout (void); + _in_type in () const; + _inout_type inout (); // TAO extension. - T * ptr (void) const; + T * ptr () const; operator T *& (); protected: @@ -67,7 +67,7 @@ template<typename T> class TAO_Fixed_Var_T : public TAO_Var_Base_T<T> { public: - TAO_Fixed_Var_T (void); + TAO_Fixed_Var_T (); TAO_Fixed_Var_T (T *); TAO_Fixed_Var_T (const TAO_Fixed_Var_T<T> &); @@ -88,8 +88,8 @@ public: typedef T _retn_type; // Mapping for fixed size types. - _out_type out (void); - _retn_type _retn (void); + _out_type out (); + _retn_type _retn (); }; /** @@ -102,7 +102,7 @@ template<typename T> class TAO_Var_Var_T : public TAO_Var_Base_T<T> { public: - TAO_Var_Var_T (void); + TAO_Var_Var_T (); TAO_Var_Var_T (T *); TAO_Var_Var_T (const TAO_Var_Var_T<T> &); @@ -117,8 +117,8 @@ public: typedef T * _retn_type; // Mapping for variable size types. - _out_type out (void); - _retn_type _retn (void); + _out_type out (); + _retn_type _retn (); }; /** @@ -141,8 +141,8 @@ public: TAO_Out_T &operator= (T *); operator T *& (); - T *& ptr (void); - T * operator-> (void); + T *& ptr (); + T * operator-> (); private: T *& ptr_; diff --git a/TAO/tao/Var_Size_Argument_T.h b/TAO/tao/Var_Size_Argument_T.h index d5425df51d5..404a03165a5 100644 --- a/TAO/tao/Var_Size_Argument_T.h +++ b/TAO/tao/Var_Size_Argument_T.h @@ -40,7 +40,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S const & arg (void) const; + S const & arg () const; protected: const S * x_; @@ -62,9 +62,9 @@ namespace TAO { public: In_Var_Size_Clonable_Argument_T (S const & x); - virtual ~In_Var_Size_Clonable_Argument_T (void); + virtual ~In_Var_Size_Clonable_Argument_T (); - virtual Argument* clone (void); + virtual Argument* clone (); private: bool is_clone_; @@ -88,7 +88,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S & arg (void); + S & arg (); private: S * x_; @@ -111,7 +111,7 @@ namespace TAO #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); private: S *& x_; @@ -128,16 +128,16 @@ namespace TAO class Ret_Var_Size_Argument_T : public RetArgument { public: - Ret_Var_Size_Argument_T (void); + Ret_Var_Size_Argument_T (); virtual CORBA::Boolean demarshal (TAO_InputCDR &); #if TAO_HAS_INTERCEPTORS == 1 virtual void interceptor_value (CORBA::Any *any) const; #endif /* TAO_HAS_INTERCEPTORS == 1 */ - S *& arg (void); + S *& arg (); - S * excp (void); - S * retn (void); + S * excp (); + S * retn (); protected: typename S::_var_type x_; diff --git a/TAO/tao/Wait_Strategy.h b/TAO/tao/Wait_Strategy.h index 3c495b7da3d..34fdab5d184 100644 --- a/TAO/tao/Wait_Strategy.h +++ b/TAO/tao/Wait_Strategy.h @@ -46,7 +46,7 @@ public: explicit TAO_Wait_Strategy (TAO_Transport *transport); /// Destructor. - virtual ~TAO_Wait_Strategy (void); + virtual ~TAO_Wait_Strategy (); /** * The user is going to send a request, prepare any internal @@ -66,11 +66,11 @@ public: /// Register the handler needs with the reactor provided that it makes /// sense for the strategy. - virtual int register_handler (void) = 0; + virtual int register_handler () = 0; /// Returns a value to indicate whether the transport needs to set /// the socket on which it is waiting to non-blocking mode or not. - virtual bool non_blocking (void) const = 0; + virtual bool non_blocking () const = 0; /// Flag that indicates whether we can process requests while /// waiting for the reply. @@ -80,7 +80,7 @@ public: * Wait_On_LF_No_Upcall does not allow the client threads to process * requests while waiting for the reply. */ - virtual bool can_process_upcalls (void) const = 0; + virtual bool can_process_upcalls () const = 0; /// Method to support deffering an upcall event till later in /// cases where can_process_upcalls() returns false. @@ -91,7 +91,7 @@ public: virtual int defer_upcall (ACE_Event_Handler*); /// Get method for the flag - bool is_registered (void) const; + bool is_registered () const; /// Set method for the flag void is_registered (bool flag); diff --git a/TAO/tao/WrongTransactionC.h b/TAO/tao/WrongTransactionC.h index d0094a94f67..11ce0f2f73a 100644 --- a/TAO/tao/WrongTransactionC.h +++ b/TAO/tao/WrongTransactionC.h @@ -63,9 +63,9 @@ namespace CORBA { public: - WrongTransaction (void); + WrongTransaction (); WrongTransaction (const WrongTransaction &); - ~WrongTransaction (void); + ~WrongTransaction (); WrongTransaction &operator= (const WrongTransaction &); @@ -74,11 +74,11 @@ namespace CORBA static WrongTransaction *_downcast (CORBA::Exception *); static const WrongTransaction *_downcast (CORBA::Exception const *); - static CORBA::Exception *_alloc (void); + static CORBA::Exception *_alloc (); - virtual CORBA::Exception *_tao_duplicate (void) const; + virtual CORBA::Exception *_tao_duplicate () const; - virtual void _raise (void) const; + virtual void _raise () const; virtual void _tao_encode ( TAO_OutputCDR & @@ -91,7 +91,7 @@ namespace CORBA // TAO_IDL - Generated from // be\be_visitor_exception/exception_ch.cpp:129 - virtual CORBA::TypeCode_ptr _tao_type (void) const; + virtual CORBA::TypeCode_ptr _tao_type () const; }; #endif /* end #if !defined */ diff --git a/TAO/tao/default_environment.h b/TAO/tao/default_environment.h index 956f8559556..cedbe7c22c7 100644 --- a/TAO/tao/default_environment.h +++ b/TAO/tao/default_environment.h @@ -33,7 +33,7 @@ namespace CORBA /** * @note We tried with CORBA::default_environment() and others. */ -TAO_Export CORBA::Environment& TAO_default_environment (void); +TAO_Export CORBA::Environment& TAO_default_environment (); TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/operation_details.h b/TAO/tao/operation_details.h index d42e66213d8..9d85feb2355 100644 --- a/TAO/tao/operation_details.h +++ b/TAO/tao/operation_details.h @@ -78,46 +78,46 @@ public: const CORBA::ULong ex_count = 0); /// Operation name - const char* opname (void) const; + const char* opname () const; /// Length of the operation name - CORBA::ULong opname_len (void) const; + CORBA::ULong opname_len () const; /// Return the flag that indicates whether the operation has any /// arguments - CORBA::Boolean argument_flag (void) const; - CORBA::Boolean in_argument_flag (void) const; + CORBA::Boolean argument_flag () const; + CORBA::Boolean in_argument_flag () const; /// Set the response flags void response_flags (CORBA::Octet flags); /// Get the response flags - CORBA::Octet response_flags (void) const; + CORBA::Octet response_flags () const; /// Accessors for the service context list - IOP::ServiceContextList &request_service_info (void); - const IOP::ServiceContextList &request_service_info (void) const; - IOP::ServiceContextList &reply_service_info (void); - const IOP::ServiceContextList &reply_service_info (void) const; + IOP::ServiceContextList &request_service_info (); + const IOP::ServiceContextList &request_service_info () const; + IOP::ServiceContextList &reply_service_info (); + const IOP::ServiceContextList &reply_service_info () const; /// Access the TAO_Service_Context - TAO_Service_Context &request_service_context (void); - const TAO_Service_Context &request_service_context (void) const; - TAO_Service_Context &reply_service_context (void); - const TAO_Service_Context &reply_service_context (void) const; + TAO_Service_Context &request_service_context (); + const TAO_Service_Context &request_service_context () const; + TAO_Service_Context &reply_service_context (); + const TAO_Service_Context &reply_service_context () const; /// Reset the contents of the service context lists that we hold. - void reset_request_service_info (void); - void reset_reply_service_info (void); + void reset_request_service_info (); + void reset_reply_service_info (); /// Cache the request id. void request_id (CORBA::ULong id); /// Return the request ID associated with the operation - CORBA::ULong request_id (void) const; + CORBA::ULong request_id () const; /// Accessor method for the addressing mode - TAO_Target_Specification::TAO_Target_Address addressing_mode (void) const; + TAO_Target_Specification::TAO_Target_Address addressing_mode () const; /// Set method for the addressing mode void addressing_mode (CORBA::Short addr); @@ -148,30 +148,30 @@ public: bool demarshal_args (TAO_InputCDR &cdr); /// Accessors for the argument list - TAO::Argument ** args (void) const; - CORBA::ULong args_num (void) const ; + TAO::Argument ** args () const; + CORBA::ULong args_num () const ; /// Exception count - CORBA::ULong ex_count (void) const; + CORBA::ULong ex_count () const; - TAO::Exception_Data const * ex_data (void) const; + TAO::Exception_Data const * ex_data () const; - CORBA::Boolean use_stub_args (void) const; + CORBA::Boolean use_stub_args () const; void use_stub_args (CORBA::Boolean use_stub_arguments); #if TAO_HAS_INTERCEPTORS == 1 void ft_expiration_time (TimeBase::TimeT time); - TimeBase::TimeT ft_expiration_time (void) const; + TimeBase::TimeT ft_expiration_time () const; void ft_retention_id (CORBA::Long request_id); - CORBA::Long ft_retention_id (void) const; + CORBA::Long ft_retention_id () const; #endif /*TAO_HAS_INTERCEPTORS == 1*/ /// Accessor for cac_ pointer. - TAO::Collocated_Arguments_Converter *cac (void) const; + TAO::Collocated_Arguments_Converter *cac () const; void cac (TAO::Collocated_Arguments_Converter *cac); - TAO_Reply_Dispatcher *reply_dispatcher (void) const; + TAO_Reply_Dispatcher *reply_dispatcher () const; void reply_dispatcher (TAO_Reply_Dispatcher *rd); private: diff --git a/TAO/tao/params.h b/TAO/tao/params.h index 891e828d415..fe06a81b545 100644 --- a/TAO/tao/params.h +++ b/TAO/tao/params.h @@ -55,7 +55,7 @@ public: typedef ACE_Array_Map<ACE_CString, ACE_CString> endpoints_map_type; /// Constructor. - TAO_ORB_Parameters (void); + TAO_ORB_Parameters (); /// Specifies the endpoints on which this server is willing to /// listen for requests. @@ -70,41 +70,41 @@ public: /// Get/Set address:port for Multicast Discovery Protocol for /// the Naming Service. - const char *mcast_discovery_endpoint (void) const; + const char *mcast_discovery_endpoint () const; void mcast_discovery_endpoint (const char *mde); /// Set/Get the size to be used for a socket's receive buffer. - int sock_rcvbuf_size (void) const; + int sock_rcvbuf_size () const; void sock_rcvbuf_size (int); /// Set/Get the size to be used for a socket's send buffer. - int sock_sndbuf_size (void) const; + int sock_sndbuf_size () const; void sock_sndbuf_size (int); /// Set/Get the status of whether to use TCP_NODELAY or not. - int nodelay (void) const; + int nodelay () const; void nodelay (int); /// Set/Get whether we should set SO_KEEPALIVE on the socket or not. - int sock_keepalive (void); + int sock_keepalive (); void sock_keepalive (int); /// Set/Get whether we should set SO_DONTROUTE on the socket or not. - int sock_dontroute (void); + int sock_dontroute (); void sock_dontroute (int); /// Set/Get the number of hops to be used for datagrams sent through socket. - int ip_hoplimit (void); + int ip_hoplimit (); void ip_hoplimit (int); /// Set/Get whether we should set IP_MULTICAST_LOOP on the socket or not. - bool ip_multicastloop (void); + bool ip_multicastloop (); void ip_multicastloop (bool); /// Set/Get client side port span values - u_short iiop_client_port_base (void); + u_short iiop_client_port_base (); void iiop_client_port_base (u_short); - u_short iiop_client_port_span (void); + u_short iiop_client_port_span (); void iiop_client_port_span (u_short); /** @@ -113,7 +113,7 @@ public: * octet sequence is small enough and there is room in the current * message block it is more efficient just to copy the buffer. */ - int cdr_memcpy_tradeoff (void) const; + int cdr_memcpy_tradeoff () const; void cdr_memcpy_tradeoff (int); /** @@ -121,36 +121,36 @@ public: * kicks in. */ //@{ - ACE_CDR::ULong max_message_size (void) const; + ACE_CDR::ULong max_message_size () const; void max_message_size (ACE_CDR::ULong size); //@} /// The ORB will use the dotted decimal notation for addresses. By /// default we use the full ascii names. - int use_dotted_decimal_addresses (void) const; + int use_dotted_decimal_addresses () const; void use_dotted_decimal_addresses (int); /// The ORB will cache incoming connections against the dotted /// decimal form of the peer's address - int cache_incoming_by_dotted_decimal_address (void) const; + int cache_incoming_by_dotted_decimal_address () const; void cache_incoming_by_dotted_decimal_address (int); /// The ORB will turn off SO_LINGER if this is zero. - int linger (void) const; + int linger () const; void linger (int); /// The amount of time desired by the user to wait to accept /// connections after a particular type of accept() error. - time_t accept_error_delay (void) const; + time_t accept_error_delay () const; void accept_error_delay (time_t); /// Set/Get the Init Reference of an arbitrary ObjectID. - char *default_init_ref (void) const; + char *default_init_ref () const; void default_init_ref (const char *default_init_ref); /// Disable the OMG standard profile components, useful for /// homogenous environments. - bool std_profile_components (void) const; + bool std_profile_components () const; void std_profile_components (bool x); /// Scheduling policy. @@ -161,7 +161,7 @@ public: * ACE_Sched_Params::priority_min(). Legal values are ACE_SCHED_RR, * ACE_SCHED_FIFO, and ACE_SCHED_OTHER. */ - int ace_sched_policy (void) const; + int ace_sched_policy () const; void ace_sched_policy (int x); /// Scheduling policy flag. @@ -171,7 +171,7 @@ public: * thread creation functions. Legal values are THR_SCHED_RR, * THR_SCHED_FIFO, and THR_SCHED_DEFAULT. */ - long sched_policy (void) const; + long sched_policy () const; void sched_policy (long x); /// Scheduling scope flag. @@ -181,47 +181,47 @@ public: * thread creation functions. Legal values are THR_SCOPE_SYSTEM and * THR_SCOPE_PROCESS. */ - long scope_policy (void) const; + long scope_policy () const; void scope_policy (long x); /// Thread creation flags. /** * Shorthand for OR'ing together the scope_policy and sched_policy. */ - long thread_creation_flags (void) const; + long thread_creation_flags () const; /// Single read optimization. - int single_read_optimization (void) const; + int single_read_optimization () const; void single_read_optimization (int x); /// Create shared profiles without priority - int shared_profile (void) const; + int shared_profile () const; void shared_profile (int x); /// Want to use parallel connection attempts when profiles have multiple /// endpoints. - bool use_parallel_connects(void) const; + bool use_parallel_connects() const; void use_parallel_connects (bool x); /// The milliseconds delay used to stagger individual connection starts /// when using parallel connects. - unsigned long parallel_connect_delay (void) const; + unsigned long parallel_connect_delay () const; void parallel_connect_delay (unsigned long x); /// Mutators and accessors for rt_collocation_resolver - bool disable_rt_collocation_resolver (void) const; + bool disable_rt_collocation_resolver () const; void disable_rt_collocation_resolver (bool); /// Accepts the list of preferred interfaces and does a simple /// semantic check on the string before setting. Also the getter. bool preferred_interfaces (const char *s); - const char *preferred_interfaces (void) const; + const char *preferred_interfaces () const; /// Utility function called by the preferred interfaces setter static bool check_preferred_interfaces_string (const char *); void enforce_pref_interfaces (bool p); - bool enforce_pref_interfaces (void) const; + bool enforce_pref_interfaces () const; #if defined (ACE_HAS_IPV6) void prefer_ipv6_interfaces (bool p); @@ -235,49 +235,49 @@ public: #endif /* ACE_HAS_IPV6 */ void negotiate_codesets (bool c); - bool negotiate_codesets (void) const; + bool negotiate_codesets () const; void ami_collication (bool opt); - bool ami_collication (void) const; + bool ami_collication () const; void protocols_hooks_name (const char *s); - const char *protocols_hooks_name (void) const; + const char *protocols_hooks_name () const; void thread_lane_resources_manager_factory_name (const char *s); - const char *thread_lane_resources_manager_factory_name (void) const; + const char *thread_lane_resources_manager_factory_name () const; void dynamic_thread_pool_config_name (const char *s); - const char *dynamic_thread_pool_config_name (void) const; + const char *dynamic_thread_pool_config_name () const; void stub_factory_name (const char *s); - const char *stub_factory_name (void) const; + const char *stub_factory_name () const; void poa_factory_name (const char *s); - const char *poa_factory_name (void) const; + const char *poa_factory_name () const; void poa_factory_directive (const ACE_TCHAR *s); - const ACE_TCHAR *poa_factory_directive (void) const; + const ACE_TCHAR *poa_factory_directive () const; void endpoint_selector_factory_name (const char *s); - const char *endpoint_selector_factory_name (void) const; + const char *endpoint_selector_factory_name () const; void collocation_resolver_name (const char *s); - const char *collocation_resolver_name (void) const; + const char *collocation_resolver_name () const; void forward_invocation_on_object_not_exist (bool opt); - bool forward_invocation_on_object_not_exist (void) const; + bool forward_invocation_on_object_not_exist () const; void forward_on_exception_limit (const int ef, const int limit); void forward_on_exception_delay (const ACE_Time_Value &delay); - TAO::Invocation_Retry_Params &invocation_retry_params (void); - const TAO::Invocation_Retry_Params &invocation_retry_params (void) const; + TAO::Invocation_Retry_Params &invocation_retry_params (); + const TAO::Invocation_Retry_Params &invocation_retry_params () const; void forward_once_exception (const int ef); int forward_once_exception () const; void allow_ziop_no_server_policies (bool opt); - bool allow_ziop_no_server_policies (void) const; + bool allow_ziop_no_server_policies () const; private: /// Each "endpoint" is of the form: diff --git a/TAO/tao/target_specification.h b/TAO/tao/target_specification.h index f8f816ec7fd..b4dc72e825b 100644 --- a/TAO/tao/target_specification.h +++ b/TAO/tao/target_specification.h @@ -56,7 +56,7 @@ class TAO_Export TAO_Target_Specification public: /// Ctor - TAO_Target_Specification (void); + TAO_Target_Specification (); enum TAO_Target_Address { // Note that this could be extended for other protocols @@ -86,14 +86,14 @@ public: * the stored specifier is not of the right type then this would * return a NULL */ - const TAO::ObjectKey* object_key (void); + const TAO::ObjectKey* object_key (); /** * Returns the IOP::TaggedProfile after a check of the stored specifier. If * the stored specifier is not of the right type then this would * return a NULL */ - const IOP::TaggedProfile *profile (void); + const IOP::TaggedProfile *profile (); /** * Returns a pointer to IOP::IOR through the parameters and the @@ -104,7 +104,7 @@ public: CORBA::ULong iop_ior (IOP::IOR *&ior); /// Access the TArget_Address specifier - TAO_Target_Address specifier (void); + TAO_Target_Address specifier (); private: /// The union of all the possibilities diff --git a/TAO/tao/varbase.h b/TAO/tao/varbase.h index b07f0c1f906..6cb0b769609 100644 --- a/TAO/tao/varbase.h +++ b/TAO/tao/varbase.h @@ -31,7 +31,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Base_var { public: - TAO_Base_var (void) {} + TAO_Base_var () {} private: diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp index 2af09d07db9..a51d948d3a1 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.cpp @@ -5,6 +5,10 @@ #include "client_interceptor.h" +Echo_Client_ORBInitializer::Echo_Client_ORBInitializer (int& result) : result_ (result) +{ +} + void Echo_Client_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) @@ -21,14 +25,13 @@ Echo_Client_ORBInitializer::post_init ( // Install the Echo client request interceptor ACE_NEW_THROW_EX (interceptor, - Echo_Client_Request_Interceptor, + Echo_Client_Request_Interceptor (this->result_), CORBA::NO_MEMORY ()); PortableInterceptor::ClientRequestInterceptor_var client_interceptor = interceptor; info->add_client_request_interceptor (client_interceptor.in ()); - } #endif /* TAO_HAS_INTERCEPTORS == 1 */ diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h index 84cdaa3c472..4a6ed849fed 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Client_ORBInitializer.h @@ -27,10 +27,14 @@ class Echo_Client_ORBInitializer : public virtual ::CORBA::LocalObject { public: + Echo_Client_ORBInitializer (int& result); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); + +private: + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp index 095a32b08e0..f50e351c6f2 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.cpp @@ -5,6 +5,10 @@ #include "server_interceptor.h" +Echo_Server_ORBInitializer::Echo_Server_ORBInitializer (int& result) : result_ (result) +{ +} + void Echo_Server_ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) @@ -21,7 +25,7 @@ Echo_Server_ORBInitializer::post_init ( // Install the Echo server request interceptor ACE_NEW_THROW_EX (interceptor, - Echo_Server_Request_Interceptor, + Echo_Server_Request_Interceptor (this->result_), CORBA::NO_MEMORY ()); PortableInterceptor::ServerRequestInterceptor_var diff --git a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h index d2c2e6de155..c611cdf28eb 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/Echo_Server_ORBInitializer.h @@ -27,10 +27,14 @@ class Echo_Server_ORBInitializer : public virtual ::CORBA::LocalObject { public: + Echo_Server_ORBInitializer (int& result); virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); + +private: + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/README b/TAO/tests/Portable_Interceptors/Dynamic/README index 6f494bcdf76..a2e686c1941 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/README +++ b/TAO/tests/Portable_Interceptors/Dynamic/README @@ -1,5 +1,3 @@ - - This test allows you to visually check the correct invocation of TAO's pseudo-portable interceptors, especially the Dynamic interface. diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp index c0153f9e365..0917bb12eaf 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client.cpp @@ -38,12 +38,10 @@ run_test (Test_Interceptors::Visual_ptr server) { CORBA::String_var msg; - server->normal (10, - msg.out ()); + server->normal (10, msg.out ()); CORBA::Long one = 1, two = 1, result = 0; - result = server->calculate (one, - two); + result = server->calculate (one, two); ACE_DEBUG ((LM_DEBUG, "calculate() result = %d\n", @@ -81,6 +79,8 @@ run_test (Test_Interceptors::Visual_ptr server) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + int result = 0; + try { #if TAO_HAS_INTERCEPTORS == 1 @@ -88,7 +88,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableInterceptor::ORBInitializer::_nil (); ACE_NEW_RETURN (temp_initializer, - Echo_Client_ORBInitializer, + Echo_Client_ORBInitializer (result), -1); // No exceptions yet! PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; @@ -128,5 +128,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; } - return 0; + return result; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp index af4dab6e0b9..5249375a979 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.cpp @@ -6,38 +6,32 @@ #include "tao/AnyTypeCode/AnyTypeCode_Adapter_Impl.h" #include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" +#include <cstring> -Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (void) - : myname_ ("Echo_Client_Interceptor") -{ -} - -Echo_Client_Request_Interceptor::~Echo_Client_Request_Interceptor () +Echo_Client_Request_Interceptor::Echo_Client_Request_Interceptor (int& result) + : result_ (result) { } char * -Echo_Client_Request_Interceptor::name (void) +Echo_Client_Request_Interceptor::name () { - return CORBA::string_dup (this->myname_); + return CORBA::string_dup ("Echo_Client_Interceptor"); } void -Echo_Client_Request_Interceptor::destroy (void) +Echo_Client_Request_Interceptor::destroy () { } void -Echo_Client_Request_Interceptor::send_poll ( - PortableInterceptor::ClientRequestInfo_ptr) +Echo_Client_Request_Interceptor::send_poll (PortableInterceptor::ClientRequestInfo_ptr) { // Do nothing } void -Echo_Client_Request_Interceptor::send_request ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::send_request (PortableInterceptor::ClientRequestInfo_ptr ri) { bool catched_exception = false; try @@ -45,13 +39,15 @@ Echo_Client_Request_Interceptor::send_request ( PortableInterceptor::ReplyStatus rstatus = ri->reply_status (); ACE_UNUSED_ARG (rstatus); } - catch (const ::CORBA::BAD_INV_ORDER&) + catch (const ::CORBA::BAD_INV_ORDER& ex) { - catched_exception = true; + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); } if (!catched_exception) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR, no exception when getting reply status\n")); } @@ -64,17 +60,15 @@ Echo_Client_Request_Interceptor::send_request ( op.in ())); // For the "normal" operation, get the argument list. - if (ACE_OS::strcmp (op.in (), - "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); if (paramlist->length () != 2) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) All parameters not available\n")); - } CORBA::ULong first = 0, second = 1; // If you dont understand @@ -92,6 +86,7 @@ Echo_Client_Request_Interceptor::send_request ( if (param != 10) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -101,6 +96,7 @@ Echo_Client_Request_Interceptor::send_request ( CORBA::TypeCode_var second_typecode = paramlist[second].argument.type (); if (second_typecode->kind () != CORBA::tk_null) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the type of the extracted out" @@ -110,10 +106,8 @@ Echo_Client_Request_Interceptor::send_request ( } void -Echo_Client_Request_Interceptor::receive_other ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::receive_other (PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -123,8 +117,7 @@ Echo_Client_Request_Interceptor::receive_other ( } void -Echo_Client_Request_Interceptor::receive_reply ( - PortableInterceptor::ClientRequestInfo_ptr ri) +Echo_Client_Request_Interceptor::receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) { CORBA::String_var op = ri->operation (); @@ -134,11 +127,9 @@ Echo_Client_Request_Interceptor::receive_reply ( op.in ())); // For the "normal" operation, get the argument list. - if (ACE_OS::strcmp (op.in (), - "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); if (paramlist->length () != 2) { @@ -153,6 +144,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (paramlist[first].mode != CORBA::PARAM_IN || paramlist[second].mode != CORBA::PARAM_OUT) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in the extracted argument list\n")); } @@ -162,6 +154,7 @@ Echo_Client_Request_Interceptor::receive_reply ( if (param != 10) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -174,9 +167,9 @@ Echo_Client_Request_Interceptor::receive_reply ( CORBA::String_var transfer (str); - if (ACE_OS::strcmp (str, - "DO_NOT_INSULT_MY_INTELLIGENCE") != 0) + if (std::strcmp (str, "DO_NOT_INSULT_MY_INTELLIGENCE") != 0) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in send_request while checking " "the value of the extracted " @@ -184,10 +177,9 @@ Echo_Client_Request_Interceptor::receive_reply ( } } - if (ACE_OS::strcmp (op.in (), "calculate") == 0) + if (std::strcmp (op.in (), "calculate") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param1, param2, result; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -206,11 +198,11 @@ Echo_Client_Request_Interceptor::receive_reply ( result)); } - if (ACE_OS::strcmp (op.in (), "_get_the_structure") == 0) + if (std::strcmp (op.in (), "_get_the_structure") == 0) { CORBA::Any_var a = ri->result (); - const Test_Interceptors::Visual::VarLenStruct * v = 0; + const Test_Interceptors::Visual::VarLenStruct * v = nullptr; (a.in ()) >>= v; @@ -227,7 +219,6 @@ void Echo_Client_Request_Interceptor::receive_exception ( PortableInterceptor::ClientRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -235,9 +226,7 @@ Echo_Client_Request_Interceptor::receive_exception ( "from \"%C\"\n", op.in ())); - - CORBA::String_var exception_id = - ri->received_exception_id (); + CORBA::String_var exception_id = ri->received_exception_id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %C\n", diff --git a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h index 5e340799c91..939e199f681 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/client_interceptor.h @@ -15,40 +15,34 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Client-side echo interceptor. For checking interceptor visually only. class Echo_Client_Request_Interceptor : public virtual PortableInterceptor::ClientRequestInterceptor, public virtual ::CORBA::LocalObject { - // = Client-side echo interceptor. For checking interceptor visually only. public: + Echo_Client_Request_Interceptor (int& result); - Echo_Client_Request_Interceptor (void); - // ctor. - - virtual char * name (void); // Canonical name of the interceptor. + char * name () override; - virtual void destroy (void); + void destroy () override; - virtual void send_poll (PortableInterceptor::ClientRequestInfo_ptr); + void send_poll (PortableInterceptor::ClientRequestInfo_ptr) override; - virtual void send_request (PortableInterceptor::ClientRequestInfo_ptr ri); + void send_request (PortableInterceptor::ClientRequestInfo_ptr ri) override; - virtual void receive_other (PortableInterceptor::ClientRequestInfo_ptr); + void receive_other (PortableInterceptor::ClientRequestInfo_ptr) override; - virtual void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri); + void receive_reply (PortableInterceptor::ClientRequestInfo_ptr ri) override; - virtual void receive_exception ( - PortableInterceptor::ClientRequestInfo_ptr ri); + void receive_exception (PortableInterceptor::ClientRequestInfo_ptr ri) override; protected: - - virtual ~Echo_Client_Request_Interceptor (void); - // dtor. + ~Echo_Client_Request_Interceptor () override = default; private: - const char *myname_; - + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl index 1113978c01a..3d1fb801bc5 100755 --- a/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl +++ b/TAO/tests/Portable_Interceptors/Dynamic/run_test.pl @@ -52,7 +52,7 @@ if ($client->PutFile ($iorbase) == -1) { exit 1; } -$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval() + 45); +$client_status = $CL->SpawnWaitKill ($server->ProcessStartWaitInterval()); if ($client_status != 0) { print STDERR "ERROR: client returned $client_status\n"; diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp index 6ca15eecd4b..809cd868d40 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server.cpp @@ -2,7 +2,6 @@ #include "test_i.h" #include "Echo_Server_ORBInitializer.h" #include "ace/OS_NS_stdio.h" - #include "tao/ORBInitializer_Registry.h" const ACE_TCHAR *ior_output_file = ACE_TEXT("test.ior"); @@ -35,6 +34,7 @@ parse_args (int argc, ACE_TCHAR *argv[]) int ACE_TMAIN(int argc, ACE_TCHAR *argv[]) { + int result = 0; try { #if TAO_HAS_INTERCEPTORS == 1 @@ -42,7 +42,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) PortableInterceptor::ORBInitializer::_nil (); ACE_NEW_RETURN (temp_initializer, - Echo_Server_ORBInitializer, + Echo_Server_ORBInitializer (result), -1); // No exceptions yet! PortableInterceptor::ORBInitializer_var orb_initializer = temp_initializer; @@ -86,7 +86,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) CORBA::String_var ior = orb->object_to_string (server.in ()); - ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%s>\n", ior.in ())); + ACE_DEBUG ((LM_DEBUG, "Test_Interceptors::Visual: <%C>\n", ior.in ())); // If the ior_output_file exists, output the ior to it if (ior_output_file != 0) @@ -115,5 +115,5 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) return 1; } - return 0; + return result; } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp index 4f12e95e2d5..20671f6c34b 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.cpp @@ -6,32 +6,99 @@ #include "testC.h" #include "ace/Log_Msg.h" -#include "ace/OS_NS_string.h" +#include <cstring> -Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (void) - : myname_ ("Echo_Server_Interceptor") -{ -} - -Echo_Server_Request_Interceptor::~Echo_Server_Request_Interceptor () +Echo_Server_Request_Interceptor::Echo_Server_Request_Interceptor (int& result) + : result_ (result) { } char * -Echo_Server_Request_Interceptor::name (void) +Echo_Server_Request_Interceptor::name () { - return CORBA::string_dup (this->myname_); + return CORBA::string_dup ("Echo_Server_Interceptor"); } void -Echo_Server_Request_Interceptor::destroy (void) +Echo_Server_Request_Interceptor::destroy () { } void Echo_Server_Request_Interceptor::receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr) + PortableInterceptor::ServerRequestInfo_ptr ri) { + bool catched_exception = false; + try + { + CORBA::String_var tmdi = ri->target_most_derived_interface (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling target_most_derived_interface from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + CORBA::Boolean tmdi = ri->target_is_a ("FOO"); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling target_is_a from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + PortableInterceptor::ReplyStatus tmdi = ri->reply_status (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling reply_status from receive_request_service_contexts\n")); + } + + catched_exception = false; + try + { + Dynamic::ParameterList_var paramlist = ri->arguments (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling arguments from receive_request_service_contexts\n")); + } } void @@ -44,13 +111,15 @@ Echo_Server_Request_Interceptor::receive_request ( PortableInterceptor::ReplyStatus rstatus = ri->reply_status (); ACE_UNUSED_ARG (rstatus); } - catch (const ::CORBA::BAD_INV_ORDER&) + catch (const ::CORBA::BAD_INV_ORDER& ex) { - catched_exception = true; + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); } if (!catched_exception) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR, no exception when getting reply status\n")); } @@ -61,10 +130,26 @@ Echo_Server_Request_Interceptor::receive_request ( "Echo_Server_Request_Interceptor::receive_request from \"%C\"\n", op.in ())); - if (ACE_OS::strcmp (op.in (), "normal") == 0) + CORBA::Boolean targetisa = ri->target_is_a ("FOO"); + if (targetisa) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_is_a, it is not a FOO\n")); + } + targetisa = ri->target_is_a ("IDL:Test_Interceptors/Visual:1.0"); + if (!targetisa) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_is_a, it should be IDL:Test_Interceptors/Visual:1.0\n")); + } + + if (std::strcmp (op.in (), "normal") == 0) + { + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -79,6 +164,7 @@ Echo_Server_Request_Interceptor::receive_request ( CORBA::TypeCode_var second_typecode = paramlist[i].argument.type (); if (second_typecode->kind () != CORBA::tk_null) { + ++this->result_; ACE_ERROR ((LM_ERROR, "(%P|%t) ERROR in receive_request while checking " "the type of the extracted out" @@ -86,29 +172,51 @@ Echo_Server_Request_Interceptor::receive_request ( } } - CORBA::String_var tmdi = - ri->target_most_derived_interface (); + CORBA::String_var tmdi = ri->target_most_derived_interface (); ACE_DEBUG ((LM_DEBUG, "Target most derived interface: %C\n", tmdi.in ())); + + if (std::strcmp (tmdi.in (), "IDL:Test_Interceptors/Visual:1.0") != 0) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR in receive_request while checking " + "target_most_derived_interface\n")); + } + + catched_exception = false; + try + { + PortableInterceptor::ReplyStatus tmdi = ri->reply_status (); + } + catch (const ::CORBA::BAD_INV_ORDER& ex) + { + // BAD_INV_ORDER should be thrown with minor code 14 + catched_exception = (ex.minor () == (CORBA::OMGVMCID | 14)); + } + + if (!catched_exception) + { + ++this->result_; + ACE_ERROR ((LM_ERROR, + "(%P|%t) ERROR, no exception when calling reply_status from receive_request\n")); + } } void -Echo_Server_Request_Interceptor::send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) +Echo_Server_Request_Interceptor::send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, "Echo_Server_Request_Interceptor::send_reply from \"%C\"\n", op.in ())); - if (ACE_OS::strcmp (op.in (), "normal") == 0) + if (std::strcmp (op.in (), "normal") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -119,10 +227,9 @@ Echo_Server_Request_Interceptor::send_reply ( param)); } - if (ACE_OS::strcmp (op.in (), "calculate") == 0) + if (std::strcmp (op.in (), "calculate") == 0) { - Dynamic::ParameterList_var paramlist = - ri->arguments (); + Dynamic::ParameterList_var paramlist = ri->arguments (); CORBA::Long param1, param2, result = 0; CORBA::ULong i = 0; // index -- explicitly used to avoid @@ -146,7 +253,6 @@ void Echo_Server_Request_Interceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr ri) { - CORBA::String_var op = ri->operation (); ACE_DEBUG ((LM_DEBUG, @@ -154,17 +260,15 @@ Echo_Server_Request_Interceptor::send_exception ( "from \"%C\"\n", op.in ())); - - CORBA::Any_var any = - ri->sending_exception (); + CORBA::Any_var any = ri->sending_exception (); CORBA::TypeCode_var type = any->type (); - const char *exception_id = type->id (); + CORBA::String_var exception_id = type->id (); ACE_DEBUG ((LM_DEBUG, "Exception ID = %C\n", - exception_id)); + exception_id.in ())); } void diff --git a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h index da47f879f3a..b0a99af2ab6 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/server_interceptor.h @@ -15,38 +15,34 @@ #pragma warning(disable:4250) #endif /* _MSC_VER */ +/// Server-side echo interceptor. For checking interceptor visually only. class Echo_Server_Request_Interceptor : public PortableInterceptor::ServerRequestInterceptor, public virtual ::CORBA::LocalObject { - // = Server-side echo interceptor. For checking interceptor visually only. public: - Echo_Server_Request_Interceptor (void); - // cotr. + Echo_Server_Request_Interceptor (int& result); - virtual char * name (void); // Canonical name of the interceptor. + char * name () override; - virtual void destroy (void); + void destroy () override; - virtual void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr); + void receive_request_service_contexts (PortableInterceptor::ServerRequestInfo_ptr) override; - virtual void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri); + void receive_request (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri); + void send_reply (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri); + void send_exception (PortableInterceptor::ServerRequestInfo_ptr ri) override; - virtual void send_other (PortableInterceptor::ServerRequestInfo_ptr); + void send_other (PortableInterceptor::ServerRequestInfo_ptr) override; protected: - - virtual ~Echo_Server_Request_Interceptor (void); - // dotr. + ~Echo_Server_Request_Interceptor () override = default; private: - const char *myname_; - + int& result_; }; #if defined(_MSC_VER) diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp index 540b0e2ebd3..600905ee3ce 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.cpp @@ -4,7 +4,6 @@ Visual_i::Visual_i (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) { } - // ctor void Visual_i::normal (CORBA::Long arg, @@ -23,9 +22,9 @@ Visual_i::calculate (CORBA::Long one, } Test_Interceptors::Visual::VarLenStruct * -Visual_i::the_structure (void) +Visual_i::the_structure () { - Test_Interceptors::Visual::VarLenStruct * s; + Test_Interceptors::Visual::VarLenStruct * s = nullptr; ACE_NEW_THROW_EX (s, Test_Interceptors::Visual::VarLenStruct, @@ -40,21 +39,21 @@ Visual_i::the_structure (void) } void -Visual_i::user (void) +Visual_i::user () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing Silly\n")); throw Test_Interceptors::Silly (); } void -Visual_i::system (void) +Visual_i::system () { ACE_DEBUG ((LM_DEBUG, "Visual::user, throwing INV_OBJREF\n")); throw CORBA::INV_OBJREF (); } void -Visual_i::shutdown (void) +Visual_i::shutdown () { this->orb_->shutdown (); } diff --git a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h index 2e8230b8576..03d5177ae04 100644 --- a/TAO/tests/Portable_Interceptors/Dynamic/test_i.h +++ b/TAO/tests/Portable_Interceptors/Dynamic/test_i.h @@ -19,24 +19,20 @@ class Visual_i : public POA_Test_Interceptors::Visual public: Visual_i (CORBA::ORB_ptr orb); - virtual CORBA::Long calculate (CORBA::Long one, - CORBA::Long two); + CORBA::Long calculate (CORBA::Long one, CORBA::Long two) override; - void normal (CORBA::Long arg, - CORBA::String_out msg); + void normal (CORBA::Long arg, CORBA::String_out msg) override; - virtual Test_Interceptors::Visual::VarLenStruct * the_structure (); + Test_Interceptors::Visual::VarLenStruct * the_structure () override; - virtual void user (void); + void user () override; - virtual void system (void); + void system () override; - virtual void shutdown (void); + void shutdown () override; private: - CORBA::ORB_var orb_; - }; #endif /* TAO_INTERCEPTOR_TEST_I_H */ |