diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-08 13:56:50 +0100 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-12-08 13:56:50 +0100 |
| commit | a1188206863383faf958343299516625eb627d58 (patch) | |
| tree | 79e9bb6af379fc4e4332191897c2ae20fa02a0bc | |
| parent | dfbe26383cee15ab6859137759b52e86c8888ffe (diff) | |
| download | ATCD-a1188206863383faf958343299516625eb627d58.tar.gz | |
Remove redundant void from tao_idl generated code
80 files changed, 386 insertions, 386 deletions
diff --git a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp index 727c236143c..e9bc800f9a7 100644 --- a/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp +++ b/TAO/TAO_IDL/be/be_visitor_any_extracted_type_decl.cpp @@ -59,7 +59,7 @@ int be_visitor_any_extracted_type_decl::visit_eventtype ( be_eventtype *node) { - os_ << node->full_name () << " * " << var_name_ << " = 0;"; + os_ << node->full_name () << " * " << var_name_ << " = nullptr;"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp index b499783f07a..bfcec987fbd 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ch.cpp @@ -306,7 +306,7 @@ int be_visitor_array_ch::visit_array (be_array *node) *os << storage_class.c_str() << node->nested_type_name (scope, "_slice", "_") << " *" << be_nl; *os << node->nested_type_name (scope, "_alloc", "_") - << " (void);" << be_nl_2; + << " ();" << be_nl_2; *os << storage_class.c_str() << "void" << be_nl << node->nested_type_name (scope, "_free", "_") << " (" << be_idt << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp index b8455fbae3f..eafc05c4e2d 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_ci.cpp @@ -341,7 +341,7 @@ int be_visitor_array_ci::visit_array (be_array *node) *os << be_nl_2 << "ACE_INLINE" << be_nl << fname << "_slice *" << be_nl - << "TAO::Array_Traits<" << fname << "_forany>::alloc (void)" + << "TAO::Array_Traits<" << fname << "_forany>::alloc ()" << be_idt << be_uidt_nl << "{" << be_idt_nl << "return " << fname << "_alloc ();" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp index af82023fa96..df353da2a53 100644 --- a/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_array/array_cs.cpp @@ -111,7 +111,7 @@ int be_visitor_array_cs::visit_array (be_array *node) // alloc method. *os << fname << "_slice *" << be_nl; - *os << fname << "_alloc (void)" << be_nl; + *os << fname << "_alloc ()" << be_nl; *os << "{" << be_idt_nl; *os << fname << "_slice *retval = 0;" << be_nl; *os << "ACE_NEW_RETURN (retval, "; diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp index 1e3ed1925fb..42d8ac9a8b6 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_ex_base.cpp @@ -153,7 +153,7 @@ be_visitor_component_ami_rh_ex_base::gen_attr_op ( } os_ << "set_" << node->local_name ()->get_string () - << " (void)" << (for_defn ? "" : ";"); + << " ()" << (for_defn ? "" : ";"); this->gen_op_body (); diff --git a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp index d304a7360c7..55661cadbf5 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/component_ami_rh_exh.cpp @@ -38,8 +38,8 @@ be_visitor_component_ami_rh_exh::visit_uses (be_uses *node) << "public virtual ::CORBA::LocalObject" << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl - << this->class_name_ << " (void);" << be_nl - << "virtual ~" << this->class_name_ << " (void);"; + << this->class_name_ << " ();" << be_nl + << "virtual ~" << this->class_name_ << " ();"; /// This overload of traverse_inheritance_graph() used here /// doesn't automatically prime the queues. @@ -112,7 +112,7 @@ be_visitor_component_ami_rh_exh::visit_operation ( if (count == 0 && vrt) { - os_ << "void);"; + os_ << ");"; } else { 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 f881d964bf7..b27b9fc6642 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 @@ -35,13 +35,13 @@ be_visitor_component_ami_rh_exs::visit_uses (be_uses *node) os_ << be_nl_2 << this->class_name_ << "::" - << this->class_name_ << " (void)" << be_nl + << this->class_name_ << " ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 << this->class_name_ << "::~" - << this->class_name_ << " (void)" << be_nl + << this->class_name_ << " ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp index 40eafca117a..7ae81441c30 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svth.cpp @@ -108,7 +108,7 @@ be_visitor_context_svth::visit_component (be_component *node) << "PortableServer::Servant sv," << be_nl << "const char *id);" << be_uidt << be_nl_2; - os_ << "virtual ~" << lname << "_Context_T (void);"; + os_ << "virtual ~" << lname << "_Context_T ();"; os_ << be_nl_2 << "/** @name Operations and members for " << lname @@ -161,12 +161,12 @@ be_visitor_context_svth::visit_uses (be_uses *node) { os_ << "::" << node_->full_name () << "::" << port_name << "Connections *" << be_nl - << "get_connections_" << port_name << " (void);"; + << "get_connections_" << port_name << " ();"; } else { os_ << "::" << obj_name << "_ptr" << be_nl - << "get_connection_" << port_name << " (void);"; + << "get_connection_" << port_name << " ();"; } os_ << be_nl << be_uidt_nl @@ -187,7 +187,7 @@ be_visitor_context_svth::visit_uses (be_uses *node) } else { - os_ << "void);"; + os_ << ");"; } os_ << be_uidt_nl << be_nl @@ -276,7 +276,7 @@ be_visitor_context_svth::visit_emits (be_emits *node) os_ << be_nl_2 << "virtual ::" << obj_name << "Consumer_ptr" << be_nl - << "disconnect_" << port_name << " (void);"; + << "disconnect_" << port_name << " ();"; os_ << be_uidt_nl << be_nl << "protected:" << be_idt_nl 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 a852dc0b99b..347b10ee719 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/context_svts.cpp @@ -70,7 +70,7 @@ be_visitor_context_svts::visit_component (be_component *node) os_ << be_nl_2 << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl << lname << "_Context_T<CONTAINER_TYPE, BASE>::~" - << lname << "_Context_T (void)" << be_nl + << lname << "_Context_T ()" << be_nl << "{" << be_nl << "}"; @@ -303,7 +303,7 @@ be_visitor_context_svts::visit_emits (be_emits *node) << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl << "::" << fname << "Consumer_ptr" << be_nl << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::disconnect_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "::" << fname << "Consumer_var ciao_emits_" << port_name << " =" << be_idt_nl << "this->ciao_emits_" << port_name << "_consumer_._retn ();" << be_uidt_nl << be_nl @@ -329,7 +329,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj, << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl << "::" << fname << "_ptr" << be_nl << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::get_connection_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "return ::" << fname << "::_duplicate (" << be_idt_nl << "this->ciao_uses_" << port_name << "_.in ());" @@ -361,7 +361,7 @@ be_visitor_context_svts::gen_uses_simplex (AST_Type *obj, << "template <typename CONTAINER_TYPE, typename BASE>" << be_nl << "::" << fname << "_ptr" << be_nl << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::disconnect_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "::" << fname << "_var ciao_uses_" << port_name << " =" << be_idt_nl << "this->ciao_uses_" << port_name << "_._retn ();" << be_uidt_nl << be_nl @@ -387,7 +387,7 @@ be_visitor_context_svts::gen_uses_multiplex ( << "::" << node_->full_name () << "::" << port_name << "Connections *" << be_nl << node_->local_name () << "_Context_T<CONTAINER_TYPE, BASE>::get_connections_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl; os_ << "ACE_GUARD_RETURN (TAO_SYNCH_MUTEX," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp index 8d754378186..412debc236a 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -81,11 +81,11 @@ be_visitor_executor_exh::visit_component (be_component *node) << "public:" << be_idt_nl; os_ << "/// Constructor" << be_nl - << lname << "_exec_i (void);"; + << lname << "_exec_i ();"; os_ << be_nl << "/// Destructor" << be_nl - << "virtual ~" << lname << "_exec_i (void);"; + << "virtual ~" << lname << "_exec_i ();"; os_ << be_nl_2 << "/** @name Supported operations and attributes. */" << be_nl @@ -147,18 +147,18 @@ be_visitor_executor_exh::visit_component (be_component *node) { os_ << be_nl_2 << "/// Component state change method to configuration_complete state" << be_nl - << "virtual void configuration_complete (void);"; + << "virtual void configuration_complete ();"; os_ << be_nl_2 << "/// Component state change method to activated state" << be_nl - << "virtual void ccm_activate (void);" << be_nl_2 + << "virtual void ccm_activate ();" << be_nl_2 << "/// Component state change method to passivated state" << be_nl - << "virtual void ccm_passivate (void);"; + << "virtual void ccm_passivate ();"; } os_ << be_nl_2 << "/// Component state change method to removed state" << be_nl - << "virtual void ccm_remove (void);"; + << "virtual void ccm_remove ();"; os_ << be_nl << "//@}"; @@ -268,7 +268,7 @@ be_visitor_executor_exh::visit_component (be_component *node) os_ << be_nl_2 << "/// Get the ACE_Reactor" << be_nl << "/// @return non-owning pointer to reactor" << be_nl - << "ACE_Reactor* reactor (void);"; + << "ACE_Reactor* reactor ();"; } os_ << be_uidt_nl @@ -302,7 +302,7 @@ be_visitor_executor_exh::visit_provides (be_provides *node) << "/// @return existing instance of facet if one exists, else creates one" << be_nl << "virtual " << global << sname << "::CCM_" << lname << "_ptr" << be_nl - << "get_" << port_name << " (void);"; + << "get_" << port_name << " ();"; return 0; } 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 ad4f0abe99b..c1a7263238c 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exs.cpp @@ -72,7 +72,7 @@ be_visitor_executor_exs::visit_attribute (be_attribute *node) os_ << be_nl << this->node_->original_local_name () << "_exec_i::" << this->ctx_->port_prefix ().c_str () - << node->local_name () << " (void)" << be_nl + << node->local_name () << " ()" << be_nl << "{" << be_idt; be_visitor_attr_return ar_visitor (this->ctx_); @@ -152,7 +152,7 @@ be_visitor_executor_exs::visit_component (be_component *node) os_ << be_nl_2 << lname << "_exec_i::" << lname - << "_exec_i (void)"; + << "_exec_i ()"; /// The overload of traverse_inheritance_graph() used here /// doesn't automatically prime the queues. @@ -195,7 +195,7 @@ be_visitor_executor_exs::visit_component (be_component *node) os_ << be_nl_2 << lname << "_exec_i::~" << lname - << "_exec_i (void)" << be_nl + << "_exec_i ()" << be_nl << "{" << be_nl << "}"; @@ -206,7 +206,7 @@ be_visitor_executor_exs::visit_component (be_component *node) { os_ << be_nl << "ACE_Reactor*" << be_nl - << lname << "_exec_i::reactor (void)" << be_nl + << lname << "_exec_i::reactor ()" << be_nl << "{" << be_idt_nl << "ACE_Reactor* reactor = 0;" << be_nl << "::CORBA::Object_var ccm_object = " << be_idt_nl @@ -297,7 +297,7 @@ be_visitor_executor_exs::visit_component (be_component *node) { os_ << be_nl_2 << "void" << be_nl - << lname << "_exec_i::configuration_complete (void)" + << lname << "_exec_i::configuration_complete ()" << be_nl << "{" << be_idt_nl << your_code_here_ << be_uidt_nl @@ -305,14 +305,14 @@ be_visitor_executor_exs::visit_component (be_component *node) os_ << be_nl_2 << "void" << be_nl - << lname << "_exec_i::ccm_activate (void)" << be_nl + << lname << "_exec_i::ccm_activate ()" << be_nl << "{" << be_idt_nl << your_code_here_ << be_uidt_nl << "}"; os_ << be_nl_2 << "void" << be_nl - << lname << "_exec_i::ccm_passivate (void)" << be_nl + << lname << "_exec_i::ccm_passivate ()" << be_nl << "{" << be_idt_nl << your_code_here_ << be_uidt_nl << "}"; @@ -320,7 +320,7 @@ be_visitor_executor_exs::visit_component (be_component *node) os_ << be_nl_2 << "void" << be_nl - << lname << "_exec_i::ccm_remove (void)" << be_nl + << lname << "_exec_i::ccm_remove ()" << be_nl << "{" << be_idt_nl << your_code_here_ << be_uidt_nl << "}"; @@ -352,7 +352,7 @@ be_visitor_executor_exs::visit_provides (be_provides *node) << global << sname << "::CCM_" << iname << "_ptr" << be_nl << node_->local_name () << "_exec_i::get_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "if ( ::CORBA::is_nil (this->ciao_" << port_name << "_.in ()))" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp index 50a469d95ac..8ba4b0082f3 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp @@ -69,7 +69,7 @@ be_visitor_facet_exh::visit_provides (be_provides *node) << this->node_->local_name () << "_Context_ptr ctx);" << be_uidt_nl << "/// Destructor" << be_nl - << "virtual ~" << lname << "_exec_i (void);"; + << "virtual ~" << lname << "_exec_i ();"; if (impl->node_type () == AST_Decl::NT_interface) { diff --git a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp index 019198e7639..1c401ba88db 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exs.cpp @@ -106,7 +106,7 @@ be_visitor_facet_exs::visit_provides (be_provides *node) os_ << be_nl_2 << lname << "_exec_i::~" << lname - << "_exec_i (void)" << be_nl + << "_exec_i ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp index 69f694f1f3a..9fbd6a8de25 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -75,7 +75,7 @@ be_visitor_servant_svh::visit_component (be_component *node) os_ << be_nl << "virtual ~" << lname << "_Servant" - << " (void);" << be_nl; + << " ();" << be_nl; if (this->node_->has_rw_attributes ()) { @@ -166,13 +166,13 @@ be_visitor_servant_svh::visit_provides (be_provides *node) os_ << be_uidt_nl << be_nl << "public:" << be_idt_nl << "virtual ::" << obj_name << "_ptr" << be_nl - << "provide_" << port_name << " (void);"; + << "provide_" << port_name << " ();"; } os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl << "void" << be_nl - << "setup_" << port_name << "_i (void);"; + << "setup_" << port_name << "_i ();"; if (!be_global->gen_lwccm ()) { @@ -207,12 +207,12 @@ be_visitor_servant_svh::visit_uses (be_uses *node) { os_ << "::" << node_->full_name () << "::" << port_name << "Connections *" << be_nl - << "get_connections_" << port_name << " (void);"; + << "get_connections_" << port_name << " ();"; } else { os_ << "::" << obj_name << "_ptr" << be_nl - << "get_connection_" << port_name << " (void);"; + << "get_connection_" << port_name << " ();"; } os_ << be_nl_2 @@ -232,7 +232,7 @@ be_visitor_servant_svh::visit_uses (be_uses *node) } else { - os_ << "void);"; + os_ << ");"; } return 0; @@ -276,7 +276,7 @@ be_visitor_servant_svh::visit_emits (be_emits *node) os_ << be_nl_2 << "virtual ::" << obj_name << "Consumer_ptr" << be_nl - << "disconnect_" << port_name << " (void);"; + << "disconnect_" << port_name << " ();"; } return 0; } @@ -329,7 +329,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) << "_Context_ptr c);" << be_uidt_nl << be_nl; os_ << "virtual ~" << ev_lname << "Consumer_" << port_name - << "_Servant (void);"; + << "_Servant ();"; os_ << be_nl_2 << "virtual void" << be_nl @@ -344,7 +344,7 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) os_ << be_nl_2 << "/// Get component implementation." << be_nl << "virtual ::CORBA::Object_ptr" << be_nl - << "_get_component (void);"; + << "_get_component ();"; os_ << be_uidt_nl << be_nl << "protected:" << be_idt_nl; @@ -364,14 +364,14 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) { os_ << be_nl_2 << "virtual ::" << obj_name << "Consumer_ptr" << be_nl - << "get_consumer_" << port_name << " (void);"; + << "get_consumer_" << port_name << " ();"; } os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl; os_ << "void" << be_nl - << "setup_consumer_" << port_name << "_i (void);"; + << "setup_consumer_" << port_name << "_i ();"; os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl; @@ -406,7 +406,7 @@ be_visitor_servant_svh::gen_non_type_specific () os_ << be_nl_2 << "virtual ::Components::ReceptacleDescriptions *" << be_nl - << "get_all_receptacles (void);"; + << "get_all_receptacles ();"; } AST_Decl::NodeType nt = this->node_->node_type (); @@ -420,7 +420,7 @@ be_visitor_servant_svh::gen_non_type_specific () os_ << be_nl_2 << "virtual ::Components::PublisherDescriptions *" << be_nl - << "get_all_publishers (void);"; + << "get_all_publishers ();"; } if (this->node_->n_emits () != 0UL) @@ -428,7 +428,7 @@ be_visitor_servant_svh::gen_non_type_specific () os_ << be_nl_2 << "virtual ::Components::EmitterDescriptions *" << be_nl - << "get_all_emitters (void);"; + << "get_all_emitters ();"; } } 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 42d6631b98e..391d75a5be1 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svs.cpp @@ -110,7 +110,7 @@ be_visitor_servant_svs::visit_component (be_component *node) os_ << be_nl_2 << lname << "_Servant::~" - << lname << "_Servant (void)" << be_nl + << lname << "_Servant ()" << be_nl << "{" << be_nl << "}"; @@ -285,7 +285,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node) os_ << be_nl_2 << "::" << obj_name << "_ptr" << be_nl << node_->local_name () << "_Servant::provide_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl; os_ << "return" << be_idt_nl @@ -297,7 +297,7 @@ be_visitor_servant_svs::visit_provides (be_provides *node) os_ << be_nl_2 << "void" << be_nl << node_->local_name () << "_Servant::setup_" - << port_name << "_i (void)" << be_nl + << port_name << "_i ()" << be_nl << "{" << be_idt_nl << "ACE_CString obj_id (this->ins_name_);" << be_nl << "obj_id += \"_" << port_name << "\";" << be_nl_2 @@ -416,7 +416,7 @@ be_visitor_servant_svs::visit_uses (be_uses *node) os_ << be_nl << node_->local_name () << "_Servant::get_connection" << (is_multiple ? "s" : "") << "_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "return this->context_->get_connection" << (is_multiple ? "s" : "") << "_" @@ -486,7 +486,7 @@ be_visitor_servant_svs::visit_emits (be_emits *node) os_ << be_nl_2 << "::" << obj_name << "Consumer_ptr" << be_nl << node_->local_name () << "_Servant::disconnect_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "return this->context_->disconnect_" << port_name << " ();" << be_uidt_nl @@ -529,14 +529,14 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node) os_ << be_nl_2 << comp_lname << "_Servant::" << lname << "Consumer_" << port_name << "_Servant::~" << lname << "Consumer_" - << port_name << "_Servant (void)" << be_nl + << port_name << "_Servant ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 << "::CORBA::Object_ptr" << be_nl << comp_lname << "_Servant::" << lname << "Consumer_" - << port_name << "_Servant::_get_component (void)" << be_nl + << port_name << "_Servant::_get_component ()" << be_nl << "{" << be_idt_nl; if (ACE_OS::strcmp (be_global->ciao_container_type (), "Session") == 0) @@ -585,7 +585,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node) os_ << be_nl_2 << "::" << fname << "Consumer_ptr" << be_nl << node_->local_name () << "_Servant::get_consumer_" - << port_name << " (void)" << be_nl + << port_name << " ()" << be_nl << "{" << be_idt_nl << "return" << be_idt_nl << "::" << fname << "Consumer::_duplicate (" << be_idt_nl @@ -597,7 +597,7 @@ be_visitor_servant_svs::visit_consumes (be_consumes *node) os_ << be_nl_2 << "void" << be_nl << node_->local_name () << "_Servant::setup_consumer_" - << port_name << "_i (void)" << be_nl + << port_name << "_i ()" << be_nl << "{" << be_idt_nl << "ACE_CString obj_id (this->ins_name_);" << be_nl << "obj_id += \"_" << port_name << "\";" << be_nl_2 @@ -773,7 +773,7 @@ be_visitor_servant_svs::gen_publishes_top () os_ << be_nl_2 << "::Components::PublisherDescriptions *" << be_nl << node_->local_name () - << "_Servant::get_all_publishers (void)" << be_nl + << "_Servant::get_all_publishers ()" << be_nl << "{" << be_idt_nl << "::Components::PublisherDescriptions *retval = 0;" << be_nl @@ -880,7 +880,7 @@ be_visitor_servant_svs::gen_uses_top () os_ << be_nl_2 << "::Components::ReceptacleDescriptions *" << be_nl << node_->local_name () - << "_Servant::get_all_receptacles (void)" << be_nl + << "_Servant::get_all_receptacles ()" << be_nl << "{" << be_idt_nl << "::Components::ReceptacleDescriptions * retval = 0;" << be_nl @@ -1001,7 +1001,7 @@ be_visitor_servant_svs::gen_get_all_emitters () os_ << be_nl_2 << "::Components::EmitterDescriptions *" << be_nl << node_->local_name () - << "_Servant::get_all_emitters (void)" << be_nl + << "_Servant::get_all_emitters ()" << be_nl << "{" << be_idt_nl << "::Components::EmitterDescriptions *retval = 0;" << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp index 9e0b92736c3..c7f28aeccf3 100644 --- a/TAO/TAO_IDL/be/be_visitor_component_scope.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component_scope.cpp @@ -287,7 +287,7 @@ be_visitor_component_scope::gen_exec_entrypoint_decl () << "extern \"C\" " << export_macro_.c_str () << " ::Components::EnterpriseComponent_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void);"; + << "_Impl ();"; } void @@ -297,7 +297,7 @@ be_visitor_component_scope::gen_exec_entrypoint_defn () << "extern \"C\" " << export_macro_.c_str () << " ::Components::EnterpriseComponent_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void)" << be_nl + << "_Impl ()" << be_nl << "{" << be_idt_nl << "::Components::EnterpriseComponent_ptr retval =" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp index 2e9bc13474c..40230a812e4 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exh.cpp @@ -83,6 +83,6 @@ be_visitor_connector_ami_exh::gen_entrypoint () << " ::Components::EnterpriseComponent_ptr" << be_nl << "create_" << ScopeAsDecl (this->node_->defined_in ())->flat_name () - << "_Impl (void);"; + << "_Impl ();"; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp index a8b3d8a4477..8cbe4b5832c 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_ami_exs.cpp @@ -76,7 +76,7 @@ be_visitor_connector_ami_exs::gen_entrypoint () os_ << be_nl_2 << "extern \"C\" ::Components::EnterpriseComponent_ptr" << be_nl - << "create_" << s->flat_name () << "_Impl (void)" << be_nl + << "create_" << s->flat_name () << "_Impl ()" << be_nl << "{" << be_idt_nl << "::Components::EnterpriseComponent_ptr retval =" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp index bc6cbed0a46..03394c4b548 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp @@ -154,9 +154,9 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) os_ << be_uidt << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl - << this->node_->local_name () << "_exec_i (void);" << be_nl + << this->node_->local_name () << "_exec_i ();" << be_nl << "virtual ~" << this->node_->local_name () - << "_exec_i (void);" << be_uidt_nl + << "_exec_i ();" << be_uidt_nl << "};"; this->gen_exec_entrypoint_decl (); diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp index dd06f3341b9..d114738c868 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp @@ -46,7 +46,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) { os_ << be_nl << this->node_->local_name () << "_exec_i::" - << this->node_->local_name () << "_exec_i (void)" + << this->node_->local_name () << "_exec_i ()" << be_idt_nl << ": " << this->base_tname_ << "_Connector_T"; @@ -130,7 +130,7 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) os_ << be_nl_2 << this->node_->local_name () << "_exec_i::~" - << this->node_->local_name () << "_exec_i (void)" << be_nl + << this->node_->local_name () << "_exec_i ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp index 81ed0c13f74..bea0ef5deb2 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exh.cpp @@ -43,9 +43,9 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node) << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl - << scope->local_name () << suffix << " (void);" << be_nl + << scope->local_name () << suffix << " ();" << be_nl << "virtual ~" << scope->local_name () << suffix - << " (void);"; + << " ();"; if (this->visit_scope (node) == -1) { @@ -65,11 +65,11 @@ be_visitor_executor_ami_exh::visit_connector (be_connector *node) << "::Components::" << be_global->ciao_container_type () << "Context_ptr ctx);" << be_nl_2 - << "virtual void configuration_complete (void);" + << "virtual void configuration_complete ();" << be_nl_2 - << "virtual void ccm_activate (void);" << be_nl - << "virtual void ccm_passivate (void);" << be_nl - << "virtual void ccm_remove (void);"; + << "virtual void ccm_activate ();" << be_nl + << "virtual void ccm_passivate ();" << be_nl + << "virtual void ccm_remove ();"; os_ << be_uidt_nl << be_nl << "private:" << be_idt_nl; @@ -116,7 +116,7 @@ be_visitor_executor_ami_exh::visit_provides (be_provides *node) AST_Decl *d = i.item (); os_ << d->local_name () << "_" - << node->local_name () << " (void);"; + << node->local_name () << " ();"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp index ae3d2f30984..68933967984 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/executor_ami_exs.cpp @@ -35,7 +35,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << class_name << "::" - << class_name << " (void)" << be_idt_nl; + << class_name << " ()" << be_idt_nl; /// The port is the only item in the connector's scope. UTL_ScopeActiveIterator j (node, UTL_Scope::IK_decls); @@ -75,7 +75,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << class_name << "::~" - << class_name << " (void)" << be_nl + << class_name << " ()" << be_nl << "{" << be_idt_nl; for (int i = 0; i < port_nr; i ++) { @@ -115,7 +115,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << "void" << be_nl - << class_name << "::configuration_complete (void)" << be_nl + << class_name << "::configuration_complete ()" << be_nl << "{" << be_idt_nl; for (int i = 0; i < port_nr; i ++) { @@ -125,13 +125,13 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << "void" << be_nl - << class_name << "::ccm_activate (void)" << be_nl + << class_name << "::ccm_activate ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 << "void" << be_nl - << class_name << "::ccm_passivate (void)" << be_nl + << class_name << "::ccm_passivate ()" << be_nl << "{" << be_nl << "}"; @@ -142,7 +142,7 @@ be_visitor_executor_ami_exs::visit_connector (be_connector *node) os_ << be_nl_2 << "void" << be_nl - << class_name << "::ccm_remove (void)" << be_nl + << class_name << "::ccm_remove ()" << be_nl << "{" << be_idt_nl; for (int i = 0; i < port_nr; i ++) { @@ -179,7 +179,7 @@ be_visitor_executor_ami_exs::visit_provides (be_provides *node) const char *exec_ext = (ACE_OS::strstr (loc_name, "sync") ? "1" : "0"); os_ << d->local_name () << "_" - << node->local_name () << " (void)" << be_nl + << node->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return " << smart_scope << scope->full_name () << "::CCM_" << t->local_name () << "::_duplicate (" diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp index 0e39a4dd453..c8cd22615a1 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exh.cpp @@ -239,7 +239,7 @@ be_visitor_facet_ami_exh::gen_reply_handler_class () << this->iface_name_ << "ReplyHandler_ptr callback," << be_nl << "::PortableServer::POA_ptr poa);" << be_uidt_nl << be_nl - << "virtual ~" << this->iface_name_ << suffix << " (void);"; + << "virtual ~" << this->iface_name_ << suffix << " ();"; int const status = this->callback_iface_->traverse_inheritance_graph ( @@ -288,9 +288,9 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () << be_uidt << be_uidt_nl << "{" << be_nl << "public:" << be_idt_nl - << iface_name << suffix << " (void);" << be_nl_2 + << iface_name << suffix << " ();" << be_nl_2 << "virtual ~" << iface_name << suffix - << " (void);"; + << " ();"; ACE_CString handler_str ( @@ -371,7 +371,7 @@ be_visitor_facet_ami_exh::gen_facet_executor_class () const char *smart_scope = (is_global ? "" : "::"); os_ << be_nl_2 - << "virtual ::CORBA::Object_ptr _get_component (void);"; + << "virtual ::CORBA::Object_ptr _get_component ();"; os_ << be_nl_2 << "virtual void _set_component (" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp index a04a4d3a646..176da224463 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp @@ -268,7 +268,7 @@ be_visitor_facet_ami_exs::gen_reply_handler_class () os_ << be_nl_2 << iface_name << suffix << "::~" - << iface_name << suffix << " (void)" << be_nl + << iface_name << suffix << " ()" << be_nl << "{" << be_nl << "}"; @@ -337,13 +337,13 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () os_ << be_nl_2 << iface_name << suffix << "::" - << iface_name << suffix << " (void)" << be_nl + << iface_name << suffix << " ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 << iface_name << suffix << "::~" - << iface_name << suffix << " (void)" << be_nl + << iface_name << suffix << " ()" << be_nl << "{" << be_nl << "}"; @@ -421,7 +421,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_class () os_ << be_nl_2 << "::CORBA::Object_ptr" << be_nl - << iface_name << "_exec_i::_get_component (void)" << be_nl + << iface_name << "_exec_i::_get_component ()" << be_nl << "{" << be_idt_nl << "return" << be_idt_nl << "::" << s->name () << smart_scope 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 58ecc114dd1..94508097dd4 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_ch.cpp @@ -58,7 +58,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) // Constructors and destructor. *os << be_nl_2 - << node->local_name () << " (void);" << be_nl + << node->local_name () << " ();" << be_nl << node->local_name () << " (const " << node->local_name () << " &);" << be_nl << "~" << node->local_name () << " (void);\n" << be_nl; @@ -77,11 +77,11 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) << "static const " << node->local_name () << " *_downcast ( ::CORBA::Exception const *);" << be_nl_2; - *os << "static ::CORBA::Exception *_alloc (void);" << be_nl_2; + *os << "static ::CORBA::Exception *_alloc ();" << be_nl_2; *os << "virtual ::CORBA::Exception *" - << "_tao_duplicate (void) const;\n" << be_nl - << "virtual void _raise (void) const;\n" << be_nl + << "_tao_duplicate () const;\n" << be_nl + << "virtual void _raise () const;\n" << be_nl << "virtual void _tao_encode (TAO_OutputCDR &cdr) const;" << be_nl << "virtual void _tao_decode (TAO_InputCDR &cdr);"; @@ -106,7 +106,7 @@ int be_visitor_exception_ch::visit_exception (be_exception *node) if (be_global->tc_support ()) { *os << be_nl_2 - << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"; + << "virtual ::CORBA::TypeCode_ptr _tao_type () const;"; } *os << be_uidt_nl << "};"; 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 d0d71d046c0..fda3de5ef27 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/exception_cs.cpp @@ -99,7 +99,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Default constructor. *os << node->name () << "::" << node->local_name () - << " (void)" << be_idt_nl; + << " ()" << be_idt_nl; *os << ": ::CORBA::UserException (" << be_idt << be_idt << be_idt_nl << "\"" << node->repoID () << "\"," << be_nl << "\"" << node->local_name () << "\")" << be_uidt @@ -109,7 +109,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Destructor. *os << node->name () << "::~" << node->local_name () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl; *os << "}" << be_nl_2; @@ -201,7 +201,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) // Generate the _alloc method. *os << "::CORBA::Exception *" << node->name () - << "::_alloc (void)" << be_nl; + << "::_alloc ()" << be_nl; *os << "{" << be_idt_nl; *os << "::CORBA::Exception *retval = 0;" << be_nl << "ACE_NEW_RETURN (retval, ::" << node->name () @@ -210,7 +210,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) *os << "}" << be_nl_2; *os << "::CORBA::Exception *" << be_nl - << node->name () << "::_tao_duplicate (void) const" << be_nl + << node->name () << "::_tao_duplicate () const" << be_nl << "{" << be_idt_nl << "::CORBA::Exception *result = 0;" << be_nl << "ACE_NEW_RETURN (result, " @@ -219,7 +219,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) << "return result;" << be_uidt_nl << "}" << be_nl_2; - *os << "void " << node->name () << "::_raise (void) const" << be_nl + *os << "void " << node->name () << "::_raise () const" << be_nl << "{" << be_idt_nl << "throw *this;" << be_uidt_nl << "}" << be_nl_2; @@ -277,7 +277,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) { *os << "// TAO extension - the virtual _type method." << be_nl << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl + << "::_tao_type () const" << be_nl << "{" << be_idt_nl << "TAO_AnyTypeCode_Adapter *adapter =" << be_idt_nl << "ACE_Dynamic_Service<TAO_AnyTypeCode_Adapter>::instance (" @@ -309,7 +309,7 @@ int be_visitor_exception_cs::visit_exception (be_exception *node) { *os << "// TAO extension - the virtual _type method." << be_nl; *os << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl; + << "::_tao_type () const" << be_nl; *os << "{" << be_idt_nl; *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; *os << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp index 167ec05bf43..c0953bcfbb7 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exh.cpp @@ -119,11 +119,11 @@ be_visitor_home_exh::gen_exec_class () os_ << be_nl << "/// Constructor" << be_nl - << lname << "_exec_i (void);"; + << lname << "_exec_i ();"; os_ << be_nl_2 << "/// Destructor" << be_nl - << "virtual ~" << lname << "_exec_i (void);"; + << "virtual ~" << lname << "_exec_i ();"; be_home *h = node_; @@ -169,7 +169,7 @@ be_visitor_home_exh::gen_exec_class () << "/// Factory method"; os_ << be_nl - << "virtual ::Components::EnterpriseComponent_ptr create (void);"; + << "virtual ::Components::EnterpriseComponent_ptr create ();"; os_ << be_uidt_nl << "};"; @@ -185,7 +185,7 @@ be_visitor_home_exh::gen_entrypoint () << "extern \"C\" " << export_macro_.c_str () << " ::Components::HomeExecutorBase_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void);"; + << "_Impl ();"; } int diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp index 860a76b1c1f..634b9cb3ae0 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_exs.cpp @@ -126,12 +126,12 @@ be_visitor_home_exs::gen_exec_class () << comment_end_border_; os_ << be_nl_2 - << lname << "_exec_i::" << lname << "_exec_i (void)" << be_nl + << lname << "_exec_i::" << lname << "_exec_i ()" << be_nl << "{" << be_nl << "}"; os_ << be_nl_2 - << lname << "_exec_i::~" << lname << "_exec_i (void)" << be_nl + << lname << "_exec_i::~" << lname << "_exec_i ()" << be_nl << "{" << be_nl << "}"; @@ -188,7 +188,7 @@ be_visitor_home_exs::gen_exec_class () os_ << be_nl_2 << "::Components::EnterpriseComponent_ptr" << be_nl - << lname << "_exec_i::create (void)" << be_nl + << lname << "_exec_i::create ()" << be_nl << "{" << be_idt_nl << "::Components::EnterpriseComponent_ptr retval =" << be_idt_nl @@ -213,7 +213,7 @@ be_visitor_home_exs::gen_entrypoint () << "extern \"C\" " << export_macro_.c_str () << " ::Components::HomeExecutorBase_ptr" << be_nl << "create_" << node_->flat_name () - << "_Impl (void)" << be_nl + << "_Impl ()" << be_nl << "{" << be_idt_nl << "::Components::HomeExecutorBase_ptr retval =" << be_idt_nl << "::Components::HomeExecutorBase::_nil ();" diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp index 0844ba3ad7e..dcf444cd61b 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svh.cpp @@ -153,7 +153,7 @@ be_visitor_home_svh::gen_servant_class () << "_Container_ptr c);" << be_uidt; os_ << be_nl_2 - << "virtual ~" << lname << "_Servant (void);"; + << "virtual ~" << lname << "_Servant ();"; if (this->node_->has_rw_attributes ()) { diff --git a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp index f84301b086b..805646d81b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_home/home_svs.cpp @@ -235,7 +235,7 @@ be_visitor_home_svs::gen_servant_class () << "}"; os_ << be_nl_2 - << lname << "_Servant::~" << lname << "_Servant (void)" + << lname << "_Servant::~" << lname << "_Servant ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp index d04f2fa09de..7dd6916b136 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_sh.cpp @@ -72,8 +72,8 @@ be_visitor_amh_rh_interface_sh::visit_interface (be_interface *node) *os << be_nl << "{" << be_nl << "public:" << be_idt_nl - << rh_skel_class_name.c_str () << " (void);" << be_nl - << "virtual ~" << rh_skel_class_name.c_str () << " (void);"; + << rh_skel_class_name.c_str () << " ();" << be_nl + << "virtual ~" << rh_skel_class_name.c_str () << " ();"; // Generate code for elements in the scope (e.g., operations). if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp index 801142ae7bc..c95bbdba3a1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_rh_ss.cpp @@ -68,7 +68,7 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; *os << rh_skel_full_scope_name.c_str () - << "::" << rh_skel_class_name.c_str () << " (void)" << be_nl + << "::" << rh_skel_class_name.c_str () << " ()" << be_nl << ": TAO_AMH_Response_Handler ()," << be_idt_nl << "::" << node->full_name () << " ()" << be_uidt << be_uidt_nl << "{" << be_nl @@ -76,7 +76,7 @@ be_visitor_amh_rh_interface_ss::visit_interface (be_interface *node) *os << rh_skel_full_scope_name.c_str () << "::~" << rh_skel_class_name.c_str () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl; *os << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp index 86082b15c9d..74a665c0482 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_sh.cpp @@ -107,7 +107,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) *os << be_uidt << be_uidt_nl << "{" << be_nl << "protected:" << be_idt_nl - << class_name.c_str () << " (void);" << be_uidt_nl << be_nl + << class_name.c_str () << " ();" << be_uidt_nl << be_nl << "public:" << be_idt_nl; // No copy constructor for locality constraint interface. @@ -128,7 +128,7 @@ be_visitor_amh_interface_sh::visit_interface (be_interface *node) // The _interface_repository_id method. *os << be_nl << "virtual const char* _interface_repository_id " - << "(void) const;"; + << "() const;"; if (this->visit_scope (node) == -1) { @@ -373,5 +373,5 @@ be_visitor_amh_interface_sh::this_method (be_interface *node) // interfaces is "special", because the returned type is not exactly // the type of the class, but the original class that "implied" the // AMH one. - *os << non_amh_name.c_str () << " *_this (void);\n" << be_uidt; + *os << non_amh_name.c_str () << " *_this ();\n" << be_uidt; } 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 d55894d85a2..f79eafd2f91 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/amh_ss.cpp @@ -66,7 +66,7 @@ be_visitor_amh_interface_ss::this_method (be_interface *node) *os << non_amh_name.c_str () << "*" << be_nl << full_skel_name - << "::_this (void)" << be_nl + << "::_this ()" << be_nl << "{" << be_idt_nl << "TAO_Stub *stub = this->_create_stub ();" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp index 431c1fb8b0c..ea9855ced65 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_sh.cpp @@ -78,7 +78,7 @@ be_visitor_interface_direct_proxy_impl_sh::visit_interface ( << "{" << be_nl << "public:" << be_idt_nl; // Dtor - *os << "virtual ~" << node->direct_proxy_impl_name () << " (void);"; + *os << "virtual ~" << node->direct_proxy_impl_name () << " ();"; if (this->visit_scope (node) == -1) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp index ec542b5ec27..50134bfb463 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/direct_proxy_impl_ss.cpp @@ -29,7 +29,7 @@ be_visitor_interface_direct_proxy_impl_ss::visit_interface ( // Destructor Implementation *os << node->full_direct_proxy_impl_name () << "::~" - << node->direct_proxy_impl_name () << " (void)" + << node->direct_proxy_impl_name () << " ()" << be_nl << "{" << be_nl << "}" << be_nl_2; if (this->visit_scope (node) == -1) diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp index 29dc80b456e..21130dd0ba5 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svth.cpp @@ -64,7 +64,7 @@ be_visitor_facet_svth::visit_interface (be_interface *node) << "typename EXEC::_ptr_type executor," << be_nl << "::Components::CCMContext_ptr ctx);" << be_uidt_nl << be_nl; - os_ << "virtual ~" << lname << "_Servant_T (void);"; + os_ << "virtual ~" << lname << "_Servant_T ();"; if (is_intf) { diff --git a/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp b/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp index f86cb614bf1..441df38fd93 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/facet_svts.cpp @@ -66,7 +66,7 @@ be_visitor_facet_svts::visit_interface (be_interface *node) os_ << be_nl_2 << "template <typename BASE, typename EXEC, typename CONTEXT>" << be_nl << lname << "_Servant_T<BASE, EXEC, CONTEXT>::~" - << lname << "_Servant_T (void)" << be_nl + << lname << "_Servant_T ()" << be_nl << "{" << be_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 58d33e95a11..102a7c67036 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -104,7 +104,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) } } - *os << "static " << node->local_name () << "_ptr _nil (void);"; + *os << "static " << node->local_name () << "_ptr _nil ();"; // Generate code for the interface definition by traversing thru the // elements of its scope. We depend on the front-end to have made sure @@ -142,7 +142,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // we have to override _add_ref() to avoid ambiguity. if (node->has_mixed_parentage ()) { - *os << "virtual void _add_ref (void);" << be_nl_2; + *os << "virtual void _add_ref ();" << be_nl_2; } // The _is_a method @@ -151,13 +151,13 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // The _interface_repository_id method. *os << "virtual const char* _interface_repository_id " - << "(void) const;"; + << "() const;"; if (be_global->gen_static_desc_operations ()) { - *os << be_nl << "static const char* _desc_repository_id (void);"; + *os << be_nl << "static const char* _desc_repository_id ();"; - *os << be_nl << "static const char* _desc_interface_name (void);"; + *os << be_nl << "static const char* _desc_interface_name ();"; } // The virtual marshal method, to prevent marshal of local interfaces. @@ -171,8 +171,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node) *os << be_nl << "virtual CORBA::Boolean _tao_encode (TAO_OutputCDR &);" << be_nl << "virtual CORBA::Boolean _tao_decode (TAO_InputCDR &);" << be_nl - << "virtual TAO_Cached_Policy_Type _tao_cached_type (void) const;" << be_nl - << "virtual TAO_Policy_Scope _tao_scope (void) const;" << be_nl; + << "virtual TAO_Cached_Policy_Type _tao_cached_type () const;" << be_nl + << "virtual TAO_Policy_Scope _tao_scope () const;" << be_nl; } if (be_global->gen_ostream_operators ()) @@ -192,7 +192,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) if (! node->is_abstract ()) { *os << "// Concrete interface only." << be_nl - << node->local_name () << " (void);" + << node->local_name () << " ();" << be_nl_2; } } @@ -201,7 +201,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) { // Protected default constructor for abstract interfaces. *os << "// Abstract or local interface only." << be_nl - << node->local_name () << " (void);" << be_nl_2; + << node->local_name () << " ();" << be_nl_2; } if (node->is_abstract ()) @@ -228,8 +228,8 @@ be_visitor_interface_ch::visit_interface (be_interface *node) << node->local_name () << " (" << be_idt << be_idt_nl << "TAO_Stub *objref," << be_nl << "::CORBA::Boolean _tao_collocated = false," << be_nl - << "TAO_Abstract_ServantBase *servant = 0," << be_nl - << "TAO_ORB_Core *orb_core = 0);" + << "TAO_Abstract_ServantBase *servant = nullptr," << be_nl + << "TAO_ORB_Core *orb_core = nullptr);" << be_uidt << be_uidt; } @@ -243,7 +243,7 @@ be_visitor_interface_ch::visit_interface (be_interface *node) // Protected destructor. *os << be_nl_2 - << "virtual ~" << node->local_name () << " (void);"; + << "virtual ~" << node->local_name () << " ();"; // Private copy constructor and assignment operator. These are not // allowed, hence they are private. diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp index fbd638a5d87..5129d1965d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ci.cpp @@ -63,7 +63,7 @@ be_visitor_interface_ci::visit_interface (be_interface *node) *os << be_nl_2 << "ACE_INLINE" << be_nl << node->name () << "::" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{}" << be_nl_2; *os << "ACE_INLINE" << be_nl 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 a4068518afa..8f681fbc85f 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_cs.cpp @@ -83,7 +83,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl_2 << node->name () << "_ptr" << be_nl - << "TAO::Objref_Traits<" << node->name () << ">::nil (void)" + << "TAO::Objref_Traits<" << node->name () << ">::nil ()" << be_nl << "{" << be_idt_nl << "return " << node->name () << "::_nil ();" << be_uidt_nl @@ -129,12 +129,12 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << " return false;" << be_nl << "}" << be_nl << be_nl << "TAO_Cached_Policy_Type" << be_nl - << "CORBA::Policy::_tao_cached_type (void) const" << be_nl + << "CORBA::Policy::_tao_cached_type () const" << be_nl << "{" << be_nl << "return TAO_CACHED_POLICY_UNCACHED;" << be_nl << "}" << be_nl << be_nl << "TAO_Policy_Scope" << be_nl - << "CORBA::Policy::_tao_scope (void) const" << be_nl + << "CORBA::Policy::_tao_scope () const" << be_nl << "{" << be_nl << " return TAO_POLICY_DEFAULT_SCOPE;" << be_nl << "}" << be_nl; @@ -189,7 +189,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) { *os << be_nl_2 << node->name () << "::" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{}"; } @@ -197,7 +197,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) { *os << be_nl_2 << node->name () << "::" << node->local_name () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl; @@ -206,7 +206,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) *os << be_nl_2 << node->name () << "::~" << node->local_name () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl << "}" << be_nl_2; bool gen_any_destructor = @@ -230,7 +230,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) if (node->has_mixed_parentage ()) { *os << "void" << be_nl - << node->name () << "::_add_ref (void)" << be_nl + << node->name () << "::_add_ref ()" << be_nl << "{" << be_idt_nl << "this->::CORBA::Object::_add_ref ();" << be_uidt_nl @@ -260,7 +260,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) // The _nil method *os << node->full_name () << "_ptr" << be_nl - << node->full_name () << "::_nil (void)" + << node->full_name () << "::_nil ()" << be_nl << "{" << be_idt_nl << "return nullptr;" << be_uidt_nl @@ -328,7 +328,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}" << be_nl_2; *os << "const char* " << node->full_name () - << "::_interface_repository_id (void) const" + << "::_interface_repository_id () const" << be_nl << "{" << be_idt_nl << "return \"" << node->repoID () @@ -338,7 +338,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) if (be_global->gen_static_desc_operations ()) { *os << be_nl_2 << "const char* " << node->full_name () - << "::_desc_repository_id (void)" + << "::_desc_repository_id ()" << be_nl << "{" << be_idt_nl << "return \"" << node->repoID () @@ -346,7 +346,7 @@ be_visitor_interface_cs::visit_interface (be_interface *node) << "}"; *os << be_nl_2 << "const char* " << node->full_name () - << "::_desc_interface_name (void)" + << "::_desc_interface_name ()" << be_nl << "{" << be_idt_nl << "return \"" << node->local_name() diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp index 85b6c23811c..448c1ebf838 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ih.cpp @@ -74,7 +74,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node) << "public:" << be_idt_nl << "// Constructor" << be_nl << be_global->impl_class_prefix () << namebuf - << be_global->impl_class_suffix () << " (void);" << be_nl_2; + << be_global->impl_class_suffix () << " ();" << be_nl_2; if (be_global->gen_copy_ctor () && !node->is_local ()) { @@ -97,7 +97,7 @@ be_visitor_interface_ih::visit_interface (be_interface *node) *os << "// Destructor" << be_nl << "virtual " << "~" << be_global->impl_class_prefix () << namebuf - << be_global->impl_class_suffix () << " (void);"; + << be_global->impl_class_suffix () << " ();"; // Generate code for elements in the scope (e.g., operations). diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp index 76e1e2b1781..0d7589dbbd4 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_is.cpp @@ -46,7 +46,7 @@ be_visitor_interface_is::visit_interface (be_interface *node) << be_global->impl_class_suffix () <<"::" << be_global->impl_class_prefix () << node->flat_name () << be_global->impl_class_suffix () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl << "}" << be_nl_2; @@ -58,7 +58,7 @@ be_visitor_interface_is::visit_interface (be_interface *node) << be_global->impl_class_suffix () <<"::~" << be_global->impl_class_prefix () << node->flat_name () << be_global->impl_class_suffix () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" <<be_nl; *os << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp index 789b4497c5c..0dd4c94accc 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_sh.cpp @@ -101,7 +101,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) << "protected:" << be_idt_nl; // Default constructor. - *os << class_name.c_str () << " (void);" + *os << class_name.c_str () << " ();" << be_uidt_nl << be_nl << "public:" << be_idt_nl; @@ -117,7 +117,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) // Copy constructor and destructor. *os << class_name.c_str () << " (const " << class_name.c_str () << "& rhs);" << be_nl - << "virtual ~" << class_name.c_str () << " (void);" << be_nl_2; + << "virtual ~" << class_name.c_str () << " ();" << be_nl_2; // _is_a *os << "virtual ::CORBA::Boolean _is_a (const char* logical_type_id);" << be_nl_2; @@ -133,7 +133,7 @@ be_visitor_interface_sh::visit_interface (be_interface *node) // The _interface_repository_id method. *os << be_nl << "virtual const char* _interface_repository_id " - << "(void) const;"; + << "() const;"; // Generate code for elements in the scope (e.g., operations). if (this->visit_scope (node) == -1) @@ -263,7 +263,7 @@ be_visitor_interface_sh::this_method (be_interface *node) TAO_OutStream *os = this->ctx_->stream (); // Print out the _this() method. - *os << "::" << node->full_name () << " *_this (void);" + *os << "::" << node->full_name () << " *_this ();" << be_nl; } 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 9847a170dd7..1d778cd0081 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ss.cpp @@ -108,7 +108,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << full_skel_name << "::" << local_name_prefix << node_local_name - << " (void)" << be_idt_nl; + << " ()" << be_idt_nl; *os << ": TAO_ServantBase ()" << be_uidt_nl; @@ -143,7 +143,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) *os << full_skel_name << "::~" << local_name_prefix << node_local_name - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{" << be_nl; *os << "}" << be_nl; @@ -202,7 +202,7 @@ be_visitor_interface_ss::visit_interface (be_interface *node) << "}" << be_nl_2; *os << "const char* " << full_skel_name - << "::_interface_repository_id (void) const" + << "::_interface_repository_id () const" << be_nl; *os << "{" << be_idt_nl; *os << "return \"" << node->repoID () << "\";" << be_uidt_nl; @@ -374,7 +374,7 @@ be_visitor_interface_ss::this_method (be_interface *node) // The _this () operation. *os << node->full_name () << " *" << be_nl << node->full_skel_name () - << "::_this (void)" << be_nl + << "::_this ()" << be_nl << "{" << be_idt_nl << "TAO_Stub *stub = this->_create_stub ();" << be_nl_2 diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp index 67307bd46ca..d403ce016d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_ch.cpp @@ -54,7 +54,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "// flexibility of having a different smart proxy per object "<<be_nl <<"// instead of per interface."<<be_nl<< be_nl << "virtual ~TAO_" << node->flat_name () - << "_Default_Proxy_Factory (void);" << be_nl_2 + << "_Default_Proxy_Factory ();" << be_nl_2 << "virtual "<< node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () @@ -73,16 +73,16 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) << "TAO_" << node->flat_name () << "_Default_Proxy_Factory *df,"<< be_nl << "bool one_shot_factory = true" << be_uidt_nl << ");" << be_uidt_nl << be_nl - << "void unregister_proxy_factory (void);" << be_nl_2 + << "void unregister_proxy_factory ();" << be_nl_2 << node->local_name () << "_ptr create_proxy (" << be_idt << be_idt_nl << node->local_name () << "_ptr proxy" << be_uidt_nl << ");" << be_uidt << be_uidt_nl << be_nl << "protected:" << be_idt_nl << "TAO_" << node->flat_name () - << "_Proxy_Factory_Adapter (void);" << be_nl + << "_Proxy_Factory_Adapter ();" << be_nl << "~TAO_" << node->flat_name () - << "_Proxy_Factory_Adapter (void);" << be_nl + << "_Proxy_Factory_Adapter ();" << be_nl << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter &operator= (" << be_idt << be_idt_nl << "const TAO_" << node->flat_name () @@ -138,19 +138,19 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) *os << "{" << be_nl << "public:" << be_idt_nl - << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" + << "TAO_"<< node->flat_name () << "_Smart_Proxy_Base ();" << be_nl // Just to keep Old g++ complier (version: 2.7.2.3) happy it's // necesssary to declare and define the destructor explicitly. - << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base (void);" + << "~TAO_"<< node->flat_name () << "_Smart_Proxy_Base ();" << be_nl // This method will delegate this method to the <base_proxy_> // member of the smart proxy and so the smart proxy's (nil) // stubobj will not be returned. - << "virtual TAO_Stub *_stubobj (void) const;" + << "virtual TAO_Stub *_stubobj () const;" << be_nl // Another version of the above method.. -<< "virtual TAO_Stub *_stubobj (void);" +<< "virtual TAO_Stub *_stubobj ();" << be_uidt_nl; // Generate code for the interface definition by traversing thru the @@ -169,7 +169,7 @@ int be_visitor_interface_smart_proxy_ch::visit_interface (be_interface *node) *os << "protected:" << be_idt_nl << "::" << node->full_name () - << "_ptr get_proxy (void);" << be_nl + << "_ptr get_proxy ();" << be_nl << "::" << node->full_name () << "_var proxy_;" << be_uidt_nl << "};\n\n"; diff --git a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp index 0018662095f..2379e9acf52 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/smart_proxy_cs.cpp @@ -65,7 +65,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_"<< node->flat_name () << "_Default_Proxy_Factory::~"; *os <<"TAO_" - << node->flat_name () << "_Default_Proxy_Factory (void)" + << node->flat_name () << "_Default_Proxy_Factory ()" << be_nl << be_uidt << be_uidt << "{" << be_nl << "}"; @@ -98,7 +98,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::"; *os << "TAO_" - << node->flat_name () << "_Proxy_Factory_Adapter (void)" << be_idt_nl + << node->flat_name () << "_Proxy_Factory_Adapter ()" << be_idt_nl << ": proxy_factory_ (0)," << be_idt_nl << "one_shot_factory_ (false)," << be_nl << "disable_factory_ (false)" << be_uidt << be_uidt_nl @@ -116,7 +116,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Proxy_Factory_Adapter::"; *os << "~TAO_" - << node->flat_name () << "_Proxy_Factory_Adapter (void)" << be_nl + << node->flat_name () << "_Proxy_Factory_Adapter ()" << be_nl << "{" << be_idt_nl << "// Making sure the factory which the adapter" << " has is destroyed with it." @@ -167,7 +167,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "::"; *os << "TAO_"<< node->flat_name () - << "_Proxy_Factory_Adapter::unregister_proxy_factory (void)" << be_nl + << "_Proxy_Factory_Adapter::unregister_proxy_factory ()" << be_nl << "{" << be_idt_nl << "ACE_MT (" << be_idt << be_idt_nl << "ACE_GUARD (" << be_idt << be_idt_nl @@ -236,7 +236,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"; *os << "TAO_" - << node->flat_name () << "_Smart_Proxy_Base (void)" << be_uidt_nl + << node->flat_name () << "_Smart_Proxy_Base ()" << be_uidt_nl << "{" << be_nl << "}" << be_nl_2; @@ -249,7 +249,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"; *os << "~TAO_" - << node->flat_name () << "_Smart_Proxy_Base (void)" <<be_nl + << node->flat_name () << "_Smart_Proxy_Base ()" <<be_nl << "{" << be_nl << "}\n\n"; @@ -263,7 +263,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "::"; *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"; - *os << "_stubobj (void) const"<<be_nl + *os << "_stubobj () const"<<be_nl << "{" << be_idt_nl << "return this->base_proxy_->_stubobj ();"<< be_uidt_nl << "}"<< be_nl_2; @@ -277,7 +277,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) if (node->is_nested ()) *os << "::"; *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::"; - *os << "_stubobj (void)"<<be_nl + *os << "_stubobj ()"<<be_nl << "{" << be_idt_nl << "return this->base_proxy_->_stubobj ();"<< be_uidt_nl << "}" << be_nl_2; @@ -302,7 +302,7 @@ int be_visitor_interface_smart_proxy_cs::visit_interface (be_interface *node) *os << "::"; *os << "TAO_" << node->flat_name () << "_Smart_Proxy_Base::" - << "get_proxy (void)" << be_idt_nl + << "get_proxy ()" << be_idt_nl << be_uidt_nl; *os << "{" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp index 7a16a8ac9c0..85f7e25cbf1 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_sh.cpp @@ -88,20 +88,20 @@ be_visitor_interface_tie_sh::visit_interface (be_interface *node) << "::CORBA::Boolean release = true);" << be_uidt << be_uidt_nl << "/// dtor" << be_nl - << "~" << tiename << " (void);" << be_nl + << "~" << tiename << " ();" << be_nl << "// TIE specific functions" << be_nl << "/// return the underlying object" << be_nl - << "T *_tied_object (void);" << be_nl + << "T *_tied_object ();" << be_nl << "/// set the underlying object" << be_nl << "void _tied_object (T &obj);" << be_nl << "/// set the underlying object and the ownership flag" << be_nl << "void _tied_object (T *obj, ::CORBA::Boolean release = true);" << be_nl << "/// do we own it" << be_nl - << "::CORBA::Boolean _is_owner (void);" << be_nl + << "::CORBA::Boolean _is_owner ();" << be_nl << "/// set the ownership" << be_nl_2 << "void _is_owner ( ::CORBA::Boolean b);" << be_nl << "// overridden ServantBase operations" << be_nl - << "PortableServer::POA_ptr _default_POA (void);"; + << "PortableServer::POA_ptr _default_POA ();"; int status = node->traverse_inheritance_graph ( diff --git a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp index 40976c5b33b..2aefd8183b7 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/tie_ss.cpp @@ -111,7 +111,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << "{}" << be_nl_2; *os << "template <class T>" << be_nl - << fulltiename << "<T>::~" << localtiename << " (void)" << be_nl + << fulltiename << "<T>::~" << localtiename << " ()" << be_nl << "{" << be_idt_nl << "if (this->rel_)" << be_idt_nl << "{" << be_idt_nl @@ -120,7 +120,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << "}" << be_nl_2; *os << "template <class T> T *" << be_nl - << fulltiename << "<T>::_tied_object (void)" << be_nl + << fulltiename << "<T>::_tied_object ()" << be_nl << "{" << be_idt_nl << "return this->ptr_;" << be_uidt_nl << "}" << be_nl_2; @@ -149,7 +149,7 @@ be_visitor_interface_tie_ss::visit_interface (be_interface *node) << "}" << be_nl_2; *os << "template <class T> ::CORBA::Boolean" << be_nl - << fulltiename << "<T>::_is_owner (void)" << be_nl + << fulltiename << "<T>::_is_owner ()" << be_nl << "{" << be_idt_nl << "return this->rel_;" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp index 8dfd3973eff..4827c027ba9 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/upcall_command_ss.cpp @@ -134,7 +134,7 @@ be_visitor_operation_upcall_command_ss::visit ( << "}" << be_nl_2; // Generate execute() method. - os << "virtual void execute (void)" << be_nl + os << "virtual void execute ()" << be_nl << "{" << be_idt_nl; if (!node->void_return_type ()) diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index 54f8899304a..dcd96d21466 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -195,7 +195,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << "public:" << be_idt; *os << be_nl - << node->local_name () << " (void);"; + << node->local_name () << " ();"; if (node->unbounded ()) { @@ -245,16 +245,16 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) << node->local_name () << "& operator= (" << node->local_name () << " &&) = default;" << be_nl; - *os << "virtual ~" << node->local_name () << " (void);"; + *os << "virtual ~" << node->local_name () << " ();"; if (be_global->alt_mapping () && node->unbounded ()) { *os << be_nl_2 - << "virtual ::CORBA::ULong length (void) const;" + << "virtual ::CORBA::ULong length () const;" << be_nl << "virtual void length (::CORBA::ULong);" << be_nl_2 - << "virtual ::CORBA::ULong maximum (void) const;"; + << "virtual ::CORBA::ULong maximum () const;"; } *os << be_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp index 38050ca3a6f..978866d68b5 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_cs.cpp @@ -109,7 +109,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) // default constructor *os << be_nl_2 << node->name () << "::" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{}"; // for unbounded sequences, we have a different set of constructors @@ -204,14 +204,14 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) // Destructor. *os << be_nl_2 << node->name () << "::~" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{}"; if (be_global->alt_mapping () && node->unbounded ()) { *os << be_nl_2 << "::CORBA::ULong" << be_nl - << node->name () << "::length (void) const" << be_nl + << node->name () << "::length () const" << be_nl << "{" << be_idt_nl << "return this->size ();" << be_uidt_nl << "}"; @@ -226,7 +226,7 @@ int be_visitor_sequence_cs::visit_sequence (be_sequence *node) *os << be_nl_2 << "::CORBA::ULong" << be_nl - << node->name () << "::maximum (void) const" << be_nl + << node->name () << "::maximum () const" << be_nl << "{" << be_idt_nl << "return this->capacity ();" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_traits.cpp b/TAO/TAO_IDL/be/be_visitor_traits.cpp index cfe93648ba0..ae8161b414b 100644 --- a/TAO/TAO_IDL/be/be_visitor_traits.cpp +++ b/TAO/TAO_IDL/be/be_visitor_traits.cpp @@ -132,7 +132,7 @@ be_visitor_traits::visit_interface (be_interface *node) << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl << "static void release (" << be_idt << be_idt_nl << "::" << fname << "_ptr p);" << be_uidt << be_uidt_nl - << "static ::" << fname << "_ptr nil (void);" << be_nl + << "static ::" << fname << "_ptr nil ();" << be_nl << "static ::CORBA::Boolean marshal (" << be_idt << be_idt_nl << "const ::" << fname << "_ptr p," << be_nl << "TAO_OutputCDR & cdr);" << be_uidt << be_uidt << be_uidt_nl @@ -454,7 +454,7 @@ be_visitor_traits::visit_array (be_array *node) << "const " << name << "_slice * _tao_from);" << be_uidt << be_uidt_nl - << "static " << name << "_slice * alloc (void);" + << "static " << name << "_slice * alloc ();" << be_nl << "static void zero (" << be_idt << be_idt_nl << name << "_slice * _tao_slice);" diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp index 4fcba8bffc1..11ece6e78d2 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ch.cpp @@ -230,7 +230,7 @@ be_visitor_typedef_ch::visit_array (be_array *node) *os << be_nl << "ACE_INLINE " << static_decl << be_nl << td_name << "_slice *" << be_nl - << td_name << "_alloc (void);" << be_nl; + << td_name << "_alloc ();" << be_nl; // _dup *os << be_nl << "ACE_INLINE " << static_decl << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp index 971d9fb24f4..c305d181e52 100644 --- a/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_typedef/typedef_ci.cpp @@ -170,7 +170,7 @@ be_visitor_typedef_ci::visit_array (be_array *node) *os << be_nl << "ACE_INLINE" << be_nl << tdef->name () << "_slice *" << be_nl; - *os << tdef->name () << "_alloc (void)" << be_nl; + *os << tdef->name () << "_alloc ()" << be_nl; *os << "{" << be_idt_nl; *os << "return " << bt->name () << "_alloc ();" << be_uidt_nl; *os << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp index 5869e229fd5..9f4f09196be 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ch.cpp @@ -70,7 +70,7 @@ be_visitor_union_discriminant_ch::visit_enum (be_enum *node) *os << be_nl_2 << "void _d (" << bt->nested_type_name (bu) << ");" << be_nl; // The get method. - *os << bt->nested_type_name (bu) << " _d (void) const;"; + *os << bt->nested_type_name (bu) << " _d () const;"; return 0; } @@ -103,7 +103,7 @@ be_visitor_union_discriminant_ch::visit_predefined_type (be_predefined_type *os << be_nl_2 << "void _d ( " << bt->nested_type_name (bu) << ");" << be_nl; // The get method. - *os << bt->nested_type_name (bu) << " _d (void) const;"; + *os << bt->nested_type_name (bu) << " _d () const;"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp index d15699f32ad..ce1b7ca49e6 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/discriminant_ci.cpp @@ -100,7 +100,7 @@ be_visitor_union_discriminant_ci::visit_enum (be_enum *node) *os << "// Accessor to get the discriminant." << be_nl << "ACE_INLINE" << be_nl << bt->name () << be_nl - << bu->name () << "::_d (void) const" << be_nl + << bu->name () << "::_d () const" << be_nl << "{" << be_idt_nl << "return this->disc_;" << be_uidt_nl << "}"; @@ -210,7 +210,7 @@ be_visitor_union_discriminant_ci::visit_predefined_type ( *os << "// Accessor to get the discriminant." << be_nl << "ACE_INLINE" << be_nl << "::" << bt->name () << be_nl - << bu->name () << "::_d (void) const" << be_nl + << bu->name () << "::_d () const" << be_nl << "{" << be_idt_nl << "return this->disc_;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp index 1add0b5e828..3943c07a55f 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_ch.cpp @@ -49,11 +49,11 @@ int be_visitor_union_ch::visit_union (be_union *node) << "public:" << be_idt_nl // Generate default and copy constructors. - << node->local_name () << " (void);" << be_nl + << node->local_name () << " ();" << be_nl << node->local_name () << " (const " << node->local_name () << " &);" << be_nl // Generate destructor. - << "~" << node->local_name () << " (void);"; + << "~" << node->local_name () << " ();"; // Generate assignment operator. *os << be_nl_2 @@ -123,7 +123,7 @@ int be_visitor_union_ch::visit_union (be_union *node) // Only if all cases are not covered AND there is no explicit // default, we get the _default () method. *os << be_nl_2 - << "void _default (void);"; + << "void _default ();"; } *os << be_uidt_nl; @@ -154,7 +154,7 @@ int be_visitor_union_ch::visit_union (be_union *node) // The reset method (TAO extension). *os << be_nl_2 << "/// TAO extension - frees any allocated storage." << be_nl; - *os << "void _reset (void);"; + *os << "void _reset ();"; *os << be_uidt_nl << "};"; diff --git a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp index f04a3b23e88..5cfcba36781 100644 --- a/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union/union_cs.cpp @@ -77,7 +77,7 @@ int be_visitor_union_cs::visit_union (be_union *node) // Generate the copy constructor and the assignment operator here. *os << be_nl_2 - << node->name () << "::" << node->local_name () << " (void)" << be_nl + << node->name () << "::" << node->local_name () << " ()" << be_nl << "{" << be_idt_nl << "ACE_OS::memset (&this->u_, 0, sizeof (this->u_));" << be_nl; @@ -189,7 +189,7 @@ int be_visitor_union_cs::visit_union (be_union *node) *os << be_uidt_nl << "}" << be_nl_2; *os << node->name () << "::~" << node->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{" << be_idt_nl << "// Finalize." << be_nl << "this->_reset ();" << be_uidt_nl @@ -267,7 +267,7 @@ int be_visitor_union_cs::visit_union (be_union *node) this->ctx_->state (TAO_CodeGen::TAO_UNION_PUBLIC_RESET_CS); *os << "/// Reset method to reset old values of a union." << be_nl; - *os << "void " << node->name () << "::_reset (void)" << be_nl; + *os << "void " << node->name () << "::_reset ()" << be_nl; *os << "{" << be_idt_nl; if (!boolDisc) diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp index 5f7aa44601e..566027008ec 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ch.cpp @@ -118,7 +118,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node) << "_" << bt->local_name () << ");" << be_nl; // The get method. *os << "_" << bt->local_name () << "_slice * " << ub->local_name () - << " (void) const; // get method"; + << " () const; // get method"; } else { @@ -133,7 +133,7 @@ be_visitor_union_branch_public_ch::visit_array (be_array *node) << be_nl; // The get method. *os << bt->nested_type_name (bu, "_slice *") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; } return 0; @@ -196,7 +196,7 @@ be_visitor_union_branch_public_ch::visit_enum (be_enum *node) << be_nl; // the get method. *os << bt->nested_type_name (bu) << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -239,7 +239,7 @@ be_visitor_union_branch_public_ch::visit_interface (be_interface *node) << ");" << be_nl; // Get method. *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -282,7 +282,7 @@ be_visitor_union_branch_public_ch::visit_interface_fwd (be_interface_fwd *node) << ");" << be_nl; // Get method. *os << bt->nested_type_name (bu, "_ptr") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -325,7 +325,7 @@ be_visitor_union_branch_public_ch::visit_valuebox (be_valuebox *node) << ");" << be_nl; // Get method. *os << bt->nested_type_name (bu, "*") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -368,7 +368,7 @@ be_visitor_union_branch_public_ch::visit_valuetype (be_valuetype *node) << ");" << be_nl; // Get method. *os << bt->nested_type_name (bu, "*") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -411,7 +411,7 @@ be_visitor_union_branch_public_ch::visit_valuetype_fwd (be_valuetype_fwd *node) << ")" << be_nl; // Get method. *os << bt->nested_type_name (bu, "*") << " " << ub->local_name () - << " (void) const;"; + << " () const;"; return 0; } @@ -457,23 +457,23 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu, "_ptr") << ");" << be_nl; *os << bt->nested_type_name (bu, "_ptr") << " " - << ub->local_name () << " (void) const;"; + << ub->local_name () << " () const;"; break; case AST_PredefinedType::PT_value: *os << be_nl_2 << "void " << ub->local_name () << " ( " << bt->nested_type_name (bu, " *") << ");" << be_nl; *os << bt->nested_type_name (bu, " *") << " " - << ub->local_name () << " (void) const;"; + << ub->local_name () << " () const;"; break; case AST_PredefinedType::PT_any: *os << be_nl_2 << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu) << " &);" << be_nl; *os << "const " << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void) const;" << be_nl; + << ub->local_name () << " () const;" << be_nl; *os << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void);"; + << ub->local_name () << " ();"; break; case AST_PredefinedType::PT_void: break; @@ -482,7 +482,7 @@ be_visitor_union_branch_public_ch::visit_predefined_type (be_predefined_type *no << "void " << ub->local_name () << " ( " << bt->nested_type_name (bu) << ");" << be_nl; *os << bt->nested_type_name (bu) << " " - << ub->local_name () << " (void) const;"; + << ub->local_name () << " () const;"; } return 0; @@ -551,10 +551,10 @@ be_visitor_union_branch_public_ch::visit_sequence (be_sequence *node) << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu) << " &);" << be_nl; *os << "const " << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void) const;" + << ub->local_name () << " () const;" << be_nl; *os << bt->nested_type_name (bu) << " &" << ub->local_name () - << " (void);"; + << " ();"; return 0; } @@ -589,7 +589,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node) *os << "void " << ub->local_name () << " (const ::CORBA::String_var&);" << be_nl; *os << "const char *" << ub->local_name () - << " (void) const;"; + << " () const;"; } else { @@ -600,7 +600,7 @@ be_visitor_union_branch_public_ch::visit_string (be_string *node) *os << "void " << ub->local_name () << " (const ::CORBA::WString_var&);" << be_nl; *os << "const ::CORBA::WChar *" << ub->local_name () - << " (void) const;"; + << " () const;"; } return 0; @@ -659,10 +659,10 @@ be_visitor_union_branch_public_ch::visit_structure (be_structure *node) << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu) << " &);" << be_nl << "const " << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void) const;" + << ub->local_name () << " () const;" << be_nl << bt->nested_type_name (bu) << " &" << ub->local_name () - << " (void);"; + << " ();"; return 0; } @@ -752,10 +752,10 @@ be_visitor_union_branch_public_ch::visit_union (be_union *node) << "void " << ub->local_name () << " (const " << bt->nested_type_name (bu) << " &);" << be_nl << "const " << bt->nested_type_name (bu) << " &" - << ub->local_name () << " (void) const;" + << ub->local_name () << " () const;" << be_nl << bt->nested_type_name (bu) << " &" << ub->local_name () - << " (void);"; + << " ();"; return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp index 9b50f8363e2..add0becee4e 100644 --- a/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_union_branch/public_ci.cpp @@ -186,7 +186,7 @@ be_visitor_union_branch_public_ci::visit_array (be_array *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << fname << "_slice *" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -257,7 +257,7 @@ be_visitor_union_branch_public_ci::visit_enum (be_enum *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << bt->name () << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -347,7 +347,7 @@ be_visitor_union_branch_public_ci::visit_interface (be_interface *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << bt->name () << "_ptr" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl << "}"; @@ -437,7 +437,7 @@ be_visitor_union_branch_public_ci::visit_interface_fwd (be_interface_fwd *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << bt->name () << "_ptr" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl << "}"; @@ -532,7 +532,7 @@ be_visitor_union_branch_public_ci::emit_valuetype_common (be_type *node) *os << "/// Retrieve the member." << be_nl << "ACE_INLINE" << be_nl << bt->name () << "*" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl << "}"; @@ -681,7 +681,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << "_ptr" << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->u_." << ub->local_name () << "_->in ();" << be_uidt_nl; @@ -694,7 +694,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << "_ptr" << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl; @@ -707,7 +707,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << " *" << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl; @@ -720,7 +720,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "const ::" << bt->name () << " &" << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}" << be_nl_2; @@ -730,7 +730,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << " &" << be_nl << bu->name () << "::" << ub->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -743,7 +743,7 @@ be_visitor_union_branch_public_ci::visit_predefined_type ( << "ACE_INLINE" << be_nl << "::" << bt->name () << be_nl << bu->name () << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -819,7 +819,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node) *os << "/// Readonly get method." << be_nl << "ACE_INLINE" << be_nl << "const " << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}" << be_nl_2; @@ -828,7 +828,7 @@ be_visitor_union_branch_public_ci::visit_sequence (be_sequence *node) *os << "/// Read/write get method." << be_nl << "ACE_INLINE" << be_nl << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void)" << be_nl + << bu->name () << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -999,7 +999,7 @@ be_visitor_union_branch_public_ci::visit_string (be_string *node) } *os << bu->name () << "::" << ub->local_name () - << " (void) const // get method" << be_nl + << " () const // get method" << be_nl << "{" << be_idt_nl << "return this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}"; @@ -1106,7 +1106,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node) *os << "// Readonly get method." << be_nl << "ACE_INLINE" << be_nl << "const " << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl; if (bt->size_type () == be_type::VARIABLE @@ -1125,7 +1125,7 @@ be_visitor_union_branch_public_ci::visit_structure (be_structure *node) *os << "// Read/write get method." << be_nl << "ACE_INLINE" << be_nl << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void)" << be_nl + << bu->name () << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl; if (bt->size_type () == be_type::VARIABLE @@ -1263,7 +1263,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node) *os << "// Readonly get method." << be_nl << "ACE_INLINE" << be_nl << "const " << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void) const" << be_nl + << bu->name () << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_nl << "}" << be_nl_2; @@ -1272,7 +1272,7 @@ be_visitor_union_branch_public_ci::visit_union (be_union *node) *os << "// Read/write get method." << be_nl << "ACE_INLINE" << be_nl << bt->name () << " &" << be_nl - << bu->name () << "::" << ub->local_name () << " (void)" << be_nl + << bu->name () << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return *this->u_." << ub->local_name () << "_;" << be_uidt_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 87e72160172..7b8b075314c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ch.cpp @@ -128,7 +128,7 @@ be_visitor_valuebox_field_ch::visit_array (be_array *node) *os << "void " << field->local_name () << " (" << fname << ");" << be_nl; *os << "const " << fname << "_slice *" << field->local_name () - << " (void) const;" << be_nl; + << " () const;" << be_nl; return 0; } 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 61b5e2ebf0e..481adfd98b2 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/field_ci.cpp @@ -138,7 +138,7 @@ be_visitor_valuebox_field_ci::visit_array (be_array *node) *os << "ACE_INLINE const " << fname << "_slice *" << be_nl << vb_node_->name () << "::" << field->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->" << field->local_name () << ";" << 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 fe77c0de8c5..7d3ad3438e5 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 @@ -135,7 +135,7 @@ be_visitor_valuebox_union_member_ci::visit_array (be_array *node) *os << "ACE_INLINE const " << fname << "_slice *" << be_nl << vb_node_->name () << "::" << field->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->" << field->local_name () << " ();" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp index ecda2bb3291..56f8e7ee686 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ch.cpp @@ -72,17 +72,17 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) << "_downcast ( ::CORBA::ValueBase *);" << be_nl; // _copy_value method - *os << "::CORBA::ValueBase * _copy_value (void);" << be_nl_2; + *os << "::CORBA::ValueBase * _copy_value ();" << be_nl_2; // repository id methods *os << "virtual const char* " - << "_tao_obv_repository_id (void) const;" + << "_tao_obv_repository_id () const;" << be_nl_2 << "virtual void " << "_tao_obv_truncatable_repo_ids (Repository_Id_List &ids) const;" << be_nl_2 << "static const char* " - << "_tao_obv_static_repository_id (void);" << be_nl_2; + << "_tao_obv_static_repository_id ();" << be_nl_2; // unmarshal method *os << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl @@ -92,7 +92,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) if (be_global->tc_support ()) { - *os << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;" + *os << "virtual ::CORBA::TypeCode_ptr _tao_type () const;" << be_nl_2; } @@ -117,7 +117,7 @@ be_visitor_valuebox_ch::visit_valuebox (be_valuebox *node) *os << be_uidt_nl << be_nl << "protected:" << be_idt_nl; - *os << "virtual ~" << node->local_name () << " (void);" << be_nl; + *os << "virtual ~" << node->local_name () << " ();" << be_nl; // Methods for marshalling and unmarshalling the value *os << "virtual ::CORBA::Boolean " @@ -183,9 +183,9 @@ be_visitor_valuebox_ch::visit_array (be_array *node) *os << "// Accessors and modifier" << be_nl; *os << "const " << node->full_name () << "_slice* " - << "_value (void) const;" << be_nl; + << "_value () const;" << be_nl; - *os << node->full_name () << "_slice* " << "_value (void);" << be_nl; + *os << node->full_name () << "_slice* " << "_value ();" << be_nl; *os << "void" << " _value (const " << node->full_name () << " val);" << be_nl_2; @@ -200,12 +200,12 @@ be_visitor_valuebox_ch::visit_array (be_array *node) // Explicit conversion functions *os << "const " << node->full_name () - << "_slice * _boxed_in (void) const;" + << "_slice * _boxed_in () const;" << be_nl; - *os << node->full_name () << "_slice * _boxed_inout (void);" << be_nl; + *os << node->full_name () << "_slice * _boxed_inout ();" << be_nl; - *os << node->full_name () << "_slice * _boxed_out (void);" << be_nl + *os << node->full_name () << "_slice * _boxed_out ();" << be_nl << be_nl; // Member variable of underlying type; @@ -362,8 +362,8 @@ be_visitor_valuebox_ch::visit_sequence (be_sequence *node) } *os << "& operator[] ( ::CORBA::ULong index) const;" << be_nl_2 - << "::CORBA::ULong maximum (void) const;" << be_nl - << "::CORBA::ULong length (void) const;" << be_nl + << "::CORBA::ULong maximum () const;" << be_nl + << "::CORBA::ULong length () const;" << be_nl << "void length ( ::CORBA::ULong len);" << be_nl_2; // Member variable of underlying type; @@ -435,7 +435,7 @@ be_visitor_valuebox_ch::visit_string (be_string *node) // Accessor function takes no arguments and returns a const char * *os << "const " << node->full_name () - << " _value (void) const;" << be_nl_2; + << " _value () const;" << be_nl_2; *os << "// Modifiers" << be_nl; @@ -725,7 +725,7 @@ be_visitor_valuebox_ch::emit_for_predef_enum (be_type *node, *os << "// Accessor and modifier" << be_nl; *os << node->full_name () << type_suffix - << " _value (void) const;" << be_nl; + << " _value () const;" << be_nl; *os << "void" << " _value (" << node->full_name () << type_suffix << " val);" << be_nl_2; @@ -751,7 +751,7 @@ be_visitor_valuebox_ch::emit_default_constructor () *os << be_nl_2 << "// Constructors" << be_nl; // Public default constructor - *os << vb_node->local_name () << " (void);" << be_nl; + *os << vb_node->local_name () << " ();" << be_nl; } void @@ -812,11 +812,11 @@ be_visitor_valuebox_ch::emit_boxed_access (be_decl *node, // Access to the boxed value for method signatures *os << const_prefix << node->full_name () << type_suffix << in_ref_modifier - << " _boxed_in (void) const;" << be_nl + << " _boxed_in () const;" << be_nl << node->full_name () << type_suffix << "&" - << " _boxed_inout (void);" << be_nl + << " _boxed_inout ();" << be_nl << node->full_name () << type_suffix << out_ref_modifier << "&" - << " _boxed_out (void);" << be_nl; + << " _boxed_out ();" << be_nl; } void @@ -827,11 +827,11 @@ be_visitor_valuebox_ch::emit_accessor_modifier (be_decl *node) *os << "// Accessors and modifier" << be_nl; // Public accessor method (const) - *os << "const " << node->full_name () << "& _value (void) const;" + *os << "const " << node->full_name () << "& _value () const;" << be_nl; // Public accessor method - *os << node->full_name () << "& _value (void);" << be_nl; + *os << node->full_name () << "& _value ();" << be_nl; // Public modifier method *os << "void" << " _value (const " << node->full_name () << "& val);" diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp index 221a666a0b2..1e1f560c15c 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_ci.cpp @@ -73,7 +73,7 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Public default constructor *os << "ACE_INLINE" << be_nl - << vb_node->name () << "::" << vb_node->local_name () << " (void)" + << vb_node->name () << "::" << vb_node->local_name () << " ()" << be_nl << "{" << be_idt_nl << "this->_pd_value = " << node->full_name () << "_alloc ();" << be_uidt_nl << "}" << be_nl_2; @@ -111,13 +111,13 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Public accessor and modifier methods *os << "ACE_INLINE const " << node->full_name () << "_slice*" << be_nl - << vb_node->name () << "::_value (void) const" << be_nl + << vb_node->name () << "::_value () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "_slice*" << be_nl - << vb_node->name () << "::_value (void)" << be_nl + << vb_node->name () << "::_value ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; @@ -146,19 +146,19 @@ be_visitor_valuebox_ci::visit_array (be_array *node) // Explicit conversion functions *os << "ACE_INLINE const " << node->full_name () << "_slice *" << be_nl - << vb_node->name () << "::_boxed_in (void) const" << be_nl + << vb_node->name () << "::_boxed_in () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl - << vb_node->name () << "::_boxed_inout (void)" << be_nl + << vb_node->name () << "::_boxed_inout ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "_slice *" << be_nl - << vb_node->name () << "::_boxed_out (void)" << be_nl + << vb_node->name () << "::_boxed_out ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.out ();" << be_uidt_nl << "}" << be_nl_2; @@ -228,14 +228,14 @@ be_visitor_valuebox_ci::visit_sequence (be_sequence *node) // Generate maximum() accessor *os << "ACE_INLINE ::CORBA::ULong" << be_nl - << vb_node->name () << "::maximum (void) const" << be_nl + << vb_node->name () << "::maximum () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->maximum ();" << be_uidt_nl << "}" << be_nl_2; // Generate length() accessor *os << "ACE_INLINE ::CORBA::ULong" << be_nl - << vb_node->name () << "::length (void) const" << be_nl + << vb_node->name () << "::length () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->length ();" << be_uidt_nl << "}" << be_nl_2; @@ -325,7 +325,7 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Accessor function takes no arguments and returns a const char * *os << "ACE_INLINE const " << node->full_name () << be_nl - << vb_node->name () << "::_value (void) const" << be_nl + << vb_node->name () << "::_value () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; @@ -356,19 +356,19 @@ be_visitor_valuebox_ci::visit_string (be_string *node) // Access to the boxed value for method signatures *os << "ACE_INLINE const " << node->full_name () << be_nl - << vb_node->name () << "::_boxed_in (void) const" << be_nl + << vb_node->name () << "::_boxed_in () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "&" << be_nl - << vb_node->name () << "::_boxed_inout (void)" << be_nl + << vb_node->name () << "::_boxed_inout ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "&" << be_nl - << vb_node->name () << "::_boxed_out (void)" << be_nl + << vb_node->name () << "::_boxed_out ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.out ();" << be_uidt_nl << "}" << be_nl_2; @@ -555,7 +555,7 @@ be_visitor_valuebox_ci::visit_union (be_union *node) << "}" << be_nl_2; *os << "ACE_INLINE " << bt->nested_type_name (node) << be_nl - << vb_node->name () << "::_d (void) const" << be_nl + << vb_node->name () << "::_d () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value->_d ();" << be_uidt_nl << "}" << be_nl_2; @@ -596,7 +596,7 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, // Public accessor method *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl - << vb_node->name () << "::_value (void) const" << be_nl + << vb_node->name () << "::_value () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; @@ -612,19 +612,19 @@ be_visitor_valuebox_ci::emit_for_predef_enum (be_type *node, // Explicit conversion functions *os << "ACE_INLINE " << node->full_name () << type_suffix << be_nl - << vb_node->name () << "::_boxed_in (void) const" << be_nl + << vb_node->name () << "::_boxed_in () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl - << vb_node->name () << "::_boxed_inout (void)" << be_nl + << vb_node->name () << "::_boxed_inout ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << type_suffix << "&" << be_nl - << vb_node->name () << "::_boxed_out (void)" << be_nl + << vb_node->name () << "::_boxed_out ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value;" << be_uidt_nl << "}" << be_nl_2; @@ -645,7 +645,7 @@ be_visitor_valuebox_ci::emit_default_constructor () // Public default constructor *os << "ACE_INLINE" << be_nl; *os << vb_node->name () << "::" << vb_node->local_name () - << " (void)" << be_nl; + << " ()" << be_nl; *os << "{}" << be_nl_2; } @@ -661,7 +661,7 @@ be_visitor_valuebox_ci::emit_default_constructor_alloc (be_decl *node) // Public default constructor *os << "ACE_INLINE" << be_nl - << vb_node->name () << "::" << vb_node->local_name () << " (void)" + << vb_node->name () << "::" << vb_node->local_name () << " ()" << be_nl << "{" << be_idt_nl << node->full_name () << "* p = 0;" << be_nl << "ACE_NEW (" << be_idt_nl @@ -809,14 +809,14 @@ be_visitor_valuebox_ci::emit_accessor_modifier (be_decl *node) // Public accessor method (const) *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl - << vb_node->name () << "::_value (void) const" << be_nl + << vb_node->name () << "::_value () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; // Public accessor method *os << "ACE_INLINE " << node->full_name () << " &" << be_nl - << vb_node->name () << "::_value (void)" << be_nl + << vb_node->name () << "::_value ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; @@ -845,20 +845,20 @@ be_visitor_valuebox_ci::emit_boxed_access (be_decl *node, // Access to the boxed value for method signatures *os << "ACE_INLINE const " << node->full_name () << " &" << be_nl - << vb_node->name () << "::_boxed_in (void) const" << be_nl + << vb_node->name () << "::_boxed_in () const" << be_nl << "{" << be_idt_nl << "return this->_pd_value.in ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << "&" << be_nl - << vb_node->name () << "::_boxed_inout (void)" << be_nl + << vb_node->name () << "::_boxed_inout ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.inout ();" << be_uidt_nl << "}" << be_nl_2; *os << "ACE_INLINE " << node->full_name () << out_ref_modifier << "&" << be_nl - << vb_node->name () << "::_boxed_out (void)" << be_nl + << vb_node->name () << "::_boxed_out ()" << be_nl << "{" << be_idt_nl << "return this->_pd_value.out ();" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp index a576e4e3322..97ee366b542 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuebox/valuebox_cs.cpp @@ -94,7 +94,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) // _copy_value method *os << "::CORBA::ValueBase *" << be_nl - << node->name () << "::_copy_value (void)" << be_nl + << node->name () << "::_copy_value ()" << be_nl << "{" << be_idt_nl << "::CORBA::ValueBase *result = 0;" << be_nl << "ACE_NEW_RETURN (" << be_idt_nl @@ -106,7 +106,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) // The _tao_obv_repository_id method. *os << "const char *" << be_nl - << node->name () << "::_tao_obv_repository_id (void) const" + << node->name () << "::_tao_obv_repository_id () const" << be_nl << "{" << be_idt_nl << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl << "}" << be_nl_2; @@ -155,7 +155,7 @@ be_visitor_valuebox_cs::visit_valuebox (be_valuebox *node) { *os << "// TAO extension - the virtual _type method." << be_nl; *os << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl; + << "::_tao_type () const" << be_nl; *os << "{" << be_idt_nl; *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; *os << "}" << be_nl_2; @@ -729,7 +729,7 @@ be_visitor_valuebox_cs::emit_destructor () be_decl * const vb_node = this->ctx_->node (); // Protected destructor - os << vb_node->name () << "::~" << vb_node->local_name () << " (void)" + os << vb_node->name () << "::~" << vb_node->local_name () << " ()" << be_nl << "{" << be_nl << "}" << be_nl_2; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp index 0fbfa14f7ea..772ff73a4b4 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_ch.cpp @@ -117,10 +117,10 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node) // The get method. *os << pre_op () << "const _" << bt->local_name () << "_slice * " << ub->local_name () - << " (void) const" << post_op () << be_nl; + << " () const" << post_op () << be_nl; *os << pre_op () << "_" << bt->local_name () << "_slice * " << ub->local_name () - << " (void)" << post_op (); + << " ()" << post_op (); } else { @@ -131,11 +131,11 @@ be_visitor_valuetype_field_ch::visit_array (be_array *node) // The get method. *os << pre_op () << bt->name () << "_slice *" << ub->local_name () - << " (void)" << post_op () << be_nl; + << " ()" << post_op () << be_nl; // The get (read/write) method. *os << pre_op () << "const " << bt->name () << "_slice *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); } return 0; @@ -195,7 +195,7 @@ be_visitor_valuetype_field_ch::visit_enum (be_enum *node) << bt->name () << ")" << post_op () << be_nl; // The get method. *os << pre_op () << bt->name () << " " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -238,7 +238,7 @@ be_visitor_valuetype_field_ch::visit_interface (be_interface *node) // Get method. *os << pre_op () << "::" << bt->name () << "_ptr " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -281,7 +281,7 @@ be_visitor_valuetype_field_ch::visit_interface_fwd (be_interface_fwd *node) // Get method. *os << pre_op () << bt->name () << "_ptr " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -324,7 +324,7 @@ be_visitor_valuetype_field_ch::visit_valuebox (be_valuebox *node) // Get method. *os << pre_op () << bt->name () << " *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -367,7 +367,7 @@ be_visitor_valuetype_field_ch::visit_valuetype (be_valuetype *node) // Get method. *os << pre_op () << bt->name () << " *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -416,7 +416,7 @@ be_visitor_valuetype_field_ch::visit_valuetype_fwd (be_valuetype_fwd *node) // Get method. *os << pre_op () << bt->name () << " *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); return 0; } @@ -469,7 +469,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) // Get method. *os << pre_op () << "::" << bt->name () << "_ptr " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); break; case AST_PredefinedType::PT_any: // Set method. @@ -478,11 +478,11 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) << post_op () << be_nl; // Get method (read-only). *os << pre_op () << "const ::" << bt->name () << " &" - << ub->local_name () << " (void) const" + << ub->local_name () << " () const" << post_op () << be_nl; // Get method (read/write). *os << pre_op () << "::" << bt->name () << " &" - << ub->local_name () << " (void)" + << ub->local_name () << " ()" << post_op (); break; case AST_PredefinedType::PT_void: @@ -495,7 +495,7 @@ be_visitor_valuetype_field_ch::visit_predefined_type (be_predefined_type *node) // Get method. *os << pre_op () << "::" << bt->name () << " " << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); } return 0; @@ -577,11 +577,11 @@ be_visitor_valuetype_field_ch::visit_sequence (be_sequence *node) << post_op () << be_nl; // Read-only. *os << pre_op () << "const " << bt->name () << " &" - << ub->local_name () << " (void) const" + << ub->local_name () << " () const" << post_op () << be_nl; // Read/write. *os << pre_op () << bt->name () << " &" << ub->local_name () - << " (void)" + << " ()" << post_op (); return 0; @@ -621,7 +621,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node) << post_op () << be_nl; // Get method. *os << pre_op () << "const char *" << ub->local_name () - << " (void) const" << post_op (); + << " () const" << post_op (); } else { @@ -636,7 +636,7 @@ be_visitor_valuetype_field_ch::visit_string (be_string *node) << post_op () << be_nl; // Get method. *os << pre_op() << "const ::CORBA::WChar *" << ub->local_name () - << " (void) const" << post_op(); + << " () const" << post_op(); } return 0; @@ -697,11 +697,11 @@ be_visitor_valuetype_field_ch::visit_structure (be_structure *node) << post_op () << be_nl; // Read-only. *os << pre_op () << "const " << bt->name () << " &"; - *os << ub->local_name () << " (void) const" + *os << ub->local_name () << " () const" << post_op () << be_nl // Read/write. << pre_op () << bt->name () << " &" << ub->local_name () - << " (void)" << post_op (); + << " ()" << post_op (); return 0; } @@ -782,11 +782,11 @@ be_visitor_valuetype_field_ch::visit_union (be_union *node) << post_op () << be_nl; // Read-only. *os << pre_op () << "const " << bt->name () << " &" - << ub->local_name () << " (void) const" + << ub->local_name () << " () const" << post_op () << be_nl; // Read/write. *os << pre_op () << bt->name () << " &" << ub->local_name () - << " (void)" << post_op (); + << " ()" << post_op (); return 0; } diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp index 5af33deb54b..1e591d5837d 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/field_cs.cpp @@ -162,7 +162,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void) const" << be_nl + *os << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -175,7 +175,7 @@ be_visitor_valuetype_field_cs::visit_array (be_array *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void)" << be_nl + *os << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl; *os << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -650,7 +650,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) os); *os << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -666,7 +666,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) this->op_name (bu, os); *os << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -680,7 +680,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) this->op_name (bu, os); *os << "::" << ub->local_name () - << " (void)" << be_nl + << " ()" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -698,7 +698,7 @@ be_visitor_valuetype_field_cs::visit_predefined_type (be_predefined_type *node) this->op_name (bu, os); *os << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -785,7 +785,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node) os); *os << "::" << ub->local_name () - << " (void) const" << be_nl + << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -799,7 +799,7 @@ be_visitor_valuetype_field_cs::visit_sequence (be_sequence *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void)" << be_nl + *os << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -942,7 +942,7 @@ be_visitor_valuetype_field_cs::visit_string (be_string *node) os); *os << "::" << ub->local_name () - << " (void) const // get method" << be_nl + << " () const // get method" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -1026,7 +1026,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void) const" << be_nl + *os << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl; *os << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -1040,7 +1040,7 @@ be_visitor_valuetype_field_cs::visit_structure (be_structure *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void)" << be_nl + *os << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl; *os << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -1138,7 +1138,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void) const" << be_nl + *os << "::" << ub->local_name () << " () const" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () @@ -1152,7 +1152,7 @@ be_visitor_valuetype_field_cs::visit_union (be_union *node) this->op_name (bu, os); - *os << "::" << ub->local_name () << " (void)" << be_nl + *os << "::" << ub->local_name () << " ()" << be_nl << "{" << be_idt_nl << "return this->" << bu->field_pd_prefix () << ub->local_name () diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp index aa9426d846f..201b7a51ac1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/marshal_cs.cpp @@ -219,7 +219,7 @@ be_visitor_valuetype_marshal_cs::visit_valuetype (be_valuetype *node) this->class_name (node, os); - *os << "::truncation_hook (void)" << be_nl + *os << "::truncation_hook ()" << be_nl << "{" << be_idt_nl << "this->require_truncation_ = true;" << be_uidt_nl << "}" << be_nl_2; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp index c27d7532d4b..89ec6a82ac8 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype.cpp @@ -842,7 +842,7 @@ be_visitor_valuetype::gen_init_defn (be_valuetype *node) // Generate the body. *os << "{" << be_nl << "public:" << be_idt_nl - << "virtual ~" << node->local_name () << "_init (void);" << be_nl; + << "virtual ~" << node->local_name () << "_init ();" << be_nl; *os << "virtual const char* tao_repository_id (void);\n" << be_nl; *os << "// create () goes here" << be_nl; @@ -880,11 +880,11 @@ be_visitor_valuetype::gen_init_impl (be_valuetype *node) node->local_name ()); // Destructor. - *os << fname << "::~" << lname << " (void)" << be_nl + *os << fname << "::~" << lname << " ()" << be_nl << "{" << be_nl << "}\n\n"; *os << "const char*" << be_nl - << fname << "::tao_repository_id (void)" << be_nl + << fname << "::tao_repository_id ()" << be_nl << "{" << be_idt_nl << "return " << node->local_name () << "::_tao_obv_static_repository_id ();" 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 d772cc6a386..cd93330c0d1 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -176,8 +176,8 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) << node->local_name () << " ( ::CORBA::Exception *ex)" << be_idt_nl << ": exception (ex)" << be_uidt_nl << "{}" << be_nl_2 - << "virtual ~" << node->local_name () << " (void);" << be_nl - << "virtual ::CORBA::ValueBase *_copy_value (void);"; + << "virtual ~" << node->local_name () << " ();" << be_nl + << "virtual ::CORBA::ValueBase *_copy_value ();"; } *os << be_nl_2 @@ -190,18 +190,18 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) << node->local_name () << " *&new_object);" << be_uidt << be_uidt_nl << be_nl << "virtual const char* " - << "_tao_obv_repository_id (void) const;" + << "_tao_obv_repository_id () const;" << be_nl_2 << "virtual void " << "_tao_obv_truncatable_repo_ids (Repository_Id_List &) const;" << be_nl_2 << "static const char* " - << "_tao_obv_static_repository_id (void);"; + << "_tao_obv_static_repository_id ();"; if (be_global->tc_support ()) { *os << be_nl_2 - << "virtual ::CORBA::TypeCode_ptr _tao_type (void) const;"; + << "virtual ::CORBA::TypeCode_ptr _tao_type () const;"; } // Generate code for the valuetype definition. @@ -245,18 +245,18 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) *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 << "virtual ::CORBA::ValueBase *_tao_to_value (void);"; + *os << "virtual ::CORBA::ValueBase *_tao_to_value ();"; } // Generate the "protected" constructor so that users cannot // instantiate us. *os << be_uidt_nl << be_nl << "protected:" << be_idt_nl << node->local_name () - << " (void);" << be_nl; + << " ();" << be_nl; if (!is_an_amh_exception_holder) { - *os << "virtual ~" << node->local_name () << " (void);" + *os << "virtual ~" << node->local_name () << " ();" << be_nl_2; } @@ -307,7 +307,7 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) << "::CORBA::Boolean " << "_tao_unmarshal_state (TAO_InputCDR &);" << be_nl << "virtual void " - << "truncation_hook (void);" + << "truncation_hook ();" << be_uidt_nl << be_nl; *os << "private:" << be_idt_nl; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp index 9edfd2658a6..19f77f7a4be 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ci.cpp @@ -44,7 +44,7 @@ be_visitor_valuetype_ci::visit_valuetype (be_valuetype *node) << "// " << __FILE__ << ":" << __LINE__ << be_nl_2; *os << "ACE_INLINE" << be_nl; - *os << node->name () << "::" << node->local_name () << " (void)" << be_nl; + *os << node->name () << "::" << node->local_name () << " ()" << be_nl; if (node->is_amh_excep_holder ()) { 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 983ae4985b3..cc4c7a339bf 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -97,7 +97,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // The _tao_obv_repository_id method. *os << "const char *" << be_nl << node->name () - << "::_tao_obv_repository_id (void) const" << be_nl + << "::_tao_obv_repository_id () const" << be_nl << "{" << be_idt_nl << "return this->_tao_obv_static_repository_id ();" << be_uidt_nl @@ -146,7 +146,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) { *os << "// TAO extension - the virtual _type method." << be_nl; *os << "::CORBA::TypeCode_ptr " << node->name () - << "::_tao_type (void) const" << be_nl; + << "::_tao_type () const" << be_nl; *os << "{" << be_idt_nl; *os << "return ::" << node->tc_name () << ";" << be_uidt_nl; *os << "}" << be_nl_2; @@ -161,7 +161,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // virtual functions, including virtual destructors, wreaks havoc // with g++ >= 4.0 RTTI support when the // "-fvisibility-inlines-hidden" command line option is used. - *os << node->name () << "::~" << node->local_name () << " (void)" + *os << node->name () << "::~" << node->local_name () << " ()" << be_nl << "{}" << be_nl_2; @@ -243,7 +243,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) // The virtual _copy_value method. *os << "::CORBA::ValueBase *" << be_nl - << node->name () << "::_copy_value (void)" << be_nl + << node->name () << "::_copy_value ()" << be_nl << "{" << be_idt_nl << "::CORBA::ValueBase *ret_val = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt_nl @@ -360,7 +360,7 @@ be_visitor_valuetype_cs::visit_valuetype (be_valuetype *node) { *os << be_nl_2 << "::CORBA::ValueBase *" << be_nl - << node->name () << "::_tao_to_value (void)" << be_nl + << node->name () << "::_tao_to_value ()" << be_nl << "{" << be_idt_nl << "return this;" << be_uidt_nl << "}"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp index 883e31041dc..2f5c07dc02b 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_ch.cpp @@ -70,7 +70,7 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) { // Public constructor. os << be_nl - << node->local_name () << "_init (void);"; + << node->local_name () << "_init ();"; } if (this->visit_valuetype_scope (node) == -1) @@ -93,13 +93,13 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) // generate create_for_unmarshal os << be_nl_2 << "virtual ::CORBA::ValueBase *" << be_nl - << "create_for_unmarshal (void);"; + << "create_for_unmarshal ();"; if (node->supports_abstract ()) { os << be_nl_2 << "virtual ::CORBA::AbstractBase_ptr" << be_nl - << "create_for_unmarshal_abstract (void);" << be_uidt; + << "create_for_unmarshal_abstract ();" << be_uidt; } } @@ -109,20 +109,20 @@ be_visitor_valuetype_init_ch::visit_valuetype (be_valuetype *node) os << "// TAO-specific extensions" << be_uidt_nl << "public:" << be_idt_nl; - os << "virtual const char* tao_repository_id (void);"; + os << "virtual const char* tao_repository_id ();"; if (factory_style == be_valuetype::FS_ABSTRACT_FACTORY) { // Protected constructor. os << be_uidt_nl << be_nl << "protected:" << be_idt_nl - << node->local_name () << "_init (void);"; + << node->local_name () << "_init ();"; } // Protected virtual destructor. os << be_uidt_nl << be_nl << "protected:" << be_idt_nl - << "virtual ~" << node->local_name () << "_init (void);" + << "virtual ~" << node->local_name () << "_init ();" << be_uidt_nl << "};"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp index b253ae89b36..ed9631216f6 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_init_cs.cpp @@ -74,12 +74,12 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // ctor *os << be_nl_2 - << fname << "::" << lname << " (void)" << be_nl + << fname << "::" << lname << " ()" << be_nl << "{" << be_nl << "}"; // dtor *os << be_nl_2 - << fname << "::~" << lname << " (void)" << be_nl + << fname << "::~" << lname << " ()" << be_nl << "{" << be_nl << "}"; // The _downcast method. @@ -94,7 +94,7 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // tao_repository_id *os << be_nl_2 << "const char*" << be_nl - << fname << "::tao_repository_id (void)" << be_nl + << fname << "::tao_repository_id ()" << be_nl << "{" << be_idt_nl << "return ::" << node->full_name () << "::_tao_obv_static_repository_id ();" @@ -106,9 +106,9 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) // generate create_for_unmarshal() *os << be_nl_2 << "::CORBA::ValueBase *" << be_nl - << fname << "::create_for_unmarshal (void)" << be_nl + << fname << "::create_for_unmarshal ()" << be_nl << "{" << be_idt_nl - << "::CORBA::ValueBase *ret_val = 0;" << be_nl + << "::CORBA::ValueBase *ret_val = nullptr;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl << "ret_val," << be_nl << "OBV_" << node->full_name () << "," << be_nl @@ -121,9 +121,9 @@ be_visitor_valuetype_init_cs::visit_valuetype (be_valuetype *node) { *os << be_nl_2 << "::CORBA::AbstractBase_ptr" << be_nl - << fname << "::create_for_unmarshal_abstract (void)" << be_nl + << fname << "::create_for_unmarshal_abstract ()" << be_nl << "{" << be_idt_nl - << "::CORBA::AbstractBase *ret_val = 0;" << be_nl + << "::CORBA::AbstractBase *ret_val = nullptr;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt << be_idt_nl << "ret_val," << be_nl << "OBV_" << node->full_name () << "," << be_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp index 22371e5e6d8..4f3c0688e53 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_ch.cpp @@ -145,8 +145,8 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) *os << be_nl_2 << "// TAO_IDL - Generated from" << be_nl << "// " << __FILE__ << ":" << __LINE__ ; - *os << be_nl_2 << "virtual void _add_ref (void);" << be_nl; - *os << "virtual void _remove_ref (void);"; + *os << be_nl_2 << "virtual void _add_ref ();" << be_nl; + *os << "virtual void _remove_ref ();"; } if (node->have_operation ()) @@ -166,7 +166,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) *os << "OBV_"; } - *os << node->local_name () << " (void);"; + *os << node->local_name () << " ();"; // Initializing constructor. if (node->has_member ()) @@ -193,7 +193,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) { *os << "OBV_"; } - *os << node->local_name () << " (void);"; + *os << node->local_name () << " ();"; // Virtual _copy_value() only provided in OBV_* class when // ::CORBA::DefaultValueRefCountBase has been included. @@ -205,7 +205,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) if (this->obv_need_ref_counter (node)) { *os << be_uidt_nl << be_nl << "public:" << be_idt_nl - << "virtual ::CORBA::ValueBase *_copy_value (void);"; + << "virtual ::CORBA::ValueBase *_copy_value ();"; } // Map fields to private data. @@ -228,7 +228,7 @@ be_visitor_valuetype_obv_ch::visit_valuetype (be_valuetype *node) << "_tao_unmarshal_state (TAO_InputCDR &, TAO_ChunkInfo &);" << be_nl << "virtual void " - << "truncation_hook (void);" + << "truncation_hook ();" << be_uidt_nl << be_nl; *os << "private:" << be_idt; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp index 32f2389daa2..4ddab60b5af 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_obv_cs.cpp @@ -51,7 +51,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) *os << "OBV_"; } - *os << node->local_name () << " (void)" << be_nl; + *os << node->local_name () << " ()" << be_nl; *os << ": require_truncation_ (false)" << be_nl << "{}" << be_nl_2; @@ -86,7 +86,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) { *os << "OBV_"; } - *os << node->local_name () << " (void)" << be_nl + *os << node->local_name () << " ()" << be_nl << "{}"; // Virtual _copy_value() only provided in OBV_* class when @@ -100,7 +100,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) { *os << be_nl_2 << "::CORBA::ValueBase *" << be_nl - << node->full_obv_skel_name () << "::_copy_value (void)" << be_nl + << node->full_obv_skel_name () << "::_copy_value ()" << be_nl << "{" << be_idt_nl << "::CORBA::ValueBase *ret_val = 0;" << be_nl << "ACE_NEW_THROW_EX (" << be_idt_nl @@ -160,7 +160,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) { *os << be_nl_2 << "void" << be_nl << node->full_obv_skel_name () - << "::_add_ref (void)" << be_nl + << "::_add_ref ()" << be_nl << "{" << be_idt_nl << "this->::CORBA::DefaultValueRefCountBase::_add_ref ();" << be_uidt_nl @@ -168,7 +168,7 @@ be_visitor_valuetype_obv_cs::visit_valuetype (be_valuetype *node) *os << be_nl << "void" << be_nl << node->full_obv_skel_name () - << "::_remove_ref (void)" << be_nl + << "::_remove_ref ()" << be_nl << "{" << be_idt_nl << "this->::CORBA::DefaultValueRefCountBase::_remove_ref ();" << be_uidt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp index 6bf1a094e90..c7032dde502 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_sh.cpp @@ -90,10 +90,10 @@ be_visitor_valuetype_sh::visit_valuetype (be_valuetype *node) *os << be_uidt << be_uidt_nl << "{" << be_nl << "protected:" << be_idt_nl - << class_name.c_str () << " (void);" << be_uidt_nl << be_nl + << class_name.c_str () << " ();" << be_uidt_nl << be_nl << "public:" << be_idt_nl; - *os << "virtual ~" << class_name.c_str () << " (void);" << be_nl << be_uidt_nl; + *os << "virtual ~" << class_name.c_str () << " ();" << be_nl << be_uidt_nl; // No copy constructor for locality constraint interface. *os << "private:" << be_idt_nl diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp index 9ed8c1127a6..2b4f1096991 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ss.cpp @@ -73,7 +73,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node) *os << full_skel_name << "::" << local_name_prefix << node_local_name - << " (void)" << be_nl + << " ()" << be_nl << "{}" << be_nl_2; // @@@ (JP) I'm commenting out the copy constructor for now. The @@ -112,7 +112,7 @@ be_visitor_valuetype_ss::visit_valuetype (be_valuetype *node) *os << full_skel_name << "::~" << local_name_prefix << node_local_name - << " (void)" << be_nl + << " ()" << be_nl << "{}"; return 0; |