diff options
Diffstat (limited to 'TAO')
83 files changed, 497 insertions, 231 deletions
diff --git a/TAO/COPYING b/TAO/COPYING index 551231de6cf..a9bbf1d9e0f 100644 --- a/TAO/COPYING +++ b/TAO/COPYING @@ -8,7 +8,7 @@ (henceforth referred to as "DOC software") are copyrighted by [5]Douglas C. Schmidt and his [6]research group at [7]Washington University, [8]University of California, Irvine, and [9]Vanderbilt - University, Copyright (c) 1993-2009, all rights reserved. Since DOC + University, Copyright (c) 1993-2011, all rights reserved. Since DOC software is open-source, freely available software, you are free to use, modify, copy, and distribute--perpetually and irrevocably--the DOC software source code and object code produced from the source, as diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f6a8a4e9cee..b2829327d20 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,156 @@ +Thu Jan 20 11:42:53 UTC 2010 Martin Corino <mcorino@remedy.nl> + + Merged changes from Remedy work branch. + + === start changelog === + + Wed Jan 19 12:16:46 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * tao/TAO_Internal.cpp: + Fixed problem with argument parsing. + + Fri Jan 14 17:19:46 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * utils/catior/Catior_i.cpp: + Added more vendor ids + + * utils/catior/README.catior: + Updated executable name + + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + Reverted change below, wasn't complete + + Fri Jan 14 10:37:44 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/servant_svh.cpp: + Layout change + + * TAO_IDL/be/be_visitor_connector/facet_ami_exs.cpp: + Layout change to the generated code + + * TAO_IDL/be/be_visitor_operation/operation_svs.cpp: + Fixed race condition in generated servant, more fixes have to be made + + Mon Jan 10 12:39:17 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/tao_portableserver.doxygen: + Doxygen improvement + + Mon Jan 10 09:10:17 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * etc/tao.doxygen: + * etc/tao_anytypecode.doxygen: + * etc/tao_av.doxygen: + * etc/tao_compression.doxygen: + * etc/tao_cosevent.doxygen: + * etc/tao_cosnaming.doxygen: + * etc/tao_cosnotification.doxygen: + * etc/tao_costime.doxygen: + * etc/tao_costrader.doxygen: + * etc/tao_dynamicany.doxygen: + * etc/tao_dynamicinterface.doxygen: + * etc/tao_esf.doxygen: + * etc/tao_ifr.doxygen: + * etc/tao_implrepo.doxygen: + * etc/tao_iormanip.doxygen: + * etc/tao_iortable.doxygen: + * etc/tao_pi.doxygen: + * etc/tao_pi_server.doxygen: + * etc/tao_portablegroup.doxygen: + * etc/tao_portableserver.doxygen: + * etc/tao_rtcorba.doxygen: + * etc/tao_rtevent.doxygen: + * etc/tao_rtportableserver.doxygen: + * etc/tao_security.doxygen: + * etc/tao_smartproxies.doxygen: + * etc/tao_ssliop.doxygen: + * etc/tao_strategies.doxygen: + * etc/tao_transportcurrent.doxygen: + * etc/tao_ziop.doxygen: + Removed deprecated macros + + Mon Jan 10 08:48:07 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/executor_exh.cpp: + * TAO_IDL/be/be_visitor_component/facet_exh.cpp: + * TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp: + * tao/Valuetype/ValueBase.h: + Layout and changes for doxygen + + Sat Jan 8 12:02:25 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/be/be_visitor_component/facet_exh.cpp: + Fixed comment to not trigger doxygen warnings + + Fri Jan 7 08:25:08 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/QtResource/QtResource.mpc: + Use qt4 + + Fri Jan 7 08:04:59 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/BiDir_GIOP/BiDir_GIOP.mpc: + * tao/CSD_Framework/CSD_Framework.mpc: + * tao/Codeset/Codeset.mpc: + * tao/DiffServPolicy/DiffServPolicy.mpc: + * tao/DynamicAny/DynamicAny.mpc: + * tao/EndpointPolicy/EndpointPolicy.mpc: + * tao/IORInterceptor/IORInterceptor.mpc: + * tao/IORManipulation/IORManipulation.mpc: + * tao/IORTable/IORTable.mpc: + * tao/ImR_Client/ImR_Client.mpc: + * tao/Messaging/Messaging.mpc: + * tao/Strategies/Strategies.mpc: + * tao/TransportCurrent/TC.mpc: + * tao/TransportCurrent/TC_IIOP.mpc: + * tao/TypeCodeFactory/TypeCodeFactory.mpc: + * tao/Valuetype/Valuetype.mpc: + * tao/ZIOP/ZIOP.mpc: + * tao/tao.mpc: + Fixed install problems with pidl files, thanks to Thomas Girard + for providing the patch + + Wed Jan 5 09:35:46 UTC 2011 Martin Corino <mcorino@remedy.nl> + + * orbsvcs\orbsvcs\Log\Hash_LogStore.cpp: + * orbsvcs\orbsvcs\PortableGroup\Portable_Group_Map.cpp: + * orbsvcs\orbsvcs\PortableGroup\PG_ObjectGroupManager.cpp: + * orbsvcs\orbsvcs\Security\SL3_CredentialsCurator.cpp: + * orbsvcs\orbsvcs\Security\SL2_SecurityManager.cpp: + * orbsvcs\orbsvcs\AV\AVStreams_i.cpp: + * orbsvcs\orbsvcs\Event\EC_TPC_Dispatching.cpp: + * orbsvcs\orbsvcs\LoadBalancing\LB_LoadMinimum.cpp: + * orbsvcs\orbsvcs\LoadBalancing\LB_LoadManager.cpp: + * orbsvcs\orbsvcs\LoadBalancing\LB_LoadAverage.cpp: + * orbsvcs\tests\Concurrency\CC_command.tab.cpp: + * orbsvcs\ImplRepo_Service\Activator_NT_Service.cpp: + * orbsvcs\ImplRepo_Service\Locator_NT_Service.h: + * orbsvcs\ImplRepo_Service\Locator_Options.cpp: + * orbsvcs\ImplRepo_Service\Activator_NT_Service.h: + * orbsvcs\ImplRepo_Service\Locator_NT_Service.cpp: + * tao\ORB_Core.h: + * utils\logWalker\Session.cpp: + Fixed compile warnings (uninitialized use, const char* assignments, + etc.). + + Sun Jan 2 13:25:46 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * TAO_IDL/tao_idl.mpc: + * tao/tao.mpc: + Integrated DESTDIR patches from debian packaging + + Wed Dec 22 14:42:05 UTC 2010 Marcel Smit <msmit@remedy.nl> + + * TAO_IDL/be/be_visitor_connector.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exh.cpp: + * TAO_IDL/be/be_visitor_connector/connector_dds_exs.cpp: + * TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h: + Removes template parameters which indicates whether the sequence + contains fixed data. This fixes bugzilla #3939. + + === end changelog === + Tue Jan 18 17:49:42 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> * NEWS: @@ -16,7 +169,7 @@ Fri Jan 14 16:54:35 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> * TAO_IDL/util/utl_err.cpp: - Added the word "error" to the error header method, so the + Added the word "error" to the error header method, so the scoreboard will be triggered to output it. Fri Jan 14 14:24:47 UTC 2011 Jeff Parsons <j.parsons@vanderbilt.edu> 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 4af04cfb6b2..fe294044a14 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/executor_exh.cpp @@ -81,8 +81,8 @@ be_visitor_executor_exh::visit_component (be_component *node) << "virtual ~" << lname << "_exec_i (void);"; os_ << be_nl_2 - << "//@{" << be_nl - << "/** Supported operations and attributes. */"; + << "/** @name Supported operations and attributes. */" << be_nl + << "//@{"; int status = node->traverse_inheritance_graph ( @@ -103,8 +103,8 @@ be_visitor_executor_exh::visit_component (be_component *node) -1); } - os_ << "//@{" << be_nl - << "/** Component attributes and port operations. */"; + os_ << "/** @name Component attributes and port operations. */" << be_nl + << "//@{"; status = this->visit_component_scope (node); @@ -120,9 +120,10 @@ be_visitor_executor_exh::visit_component (be_component *node) -1); } - os_ << "//@{" << be_nl - << "/** Operations from Components::" << be_global->ciao_container_type () - << "Component. */"; + os_ + << "/** @name Operations from Components::" << be_global->ciao_container_type () + << "Component. */" << be_nl + << "//@{"; const char *container_type = be_global->ciao_container_type (); @@ -149,8 +150,8 @@ be_visitor_executor_exh::visit_component (be_component *node) << "//@}"; os_ << be_nl_2 - << "//@{" << be_nl - << "/** User defined public operations. */"; + << "/** @name User defined public operations. */" << be_nl + << "//@{"; os_ << be_nl_2 << "//@}"; @@ -168,8 +169,8 @@ be_visitor_executor_exh::visit_component (be_component *node) be_visitor_executor_private_exh v (this->ctx_); v.node (node); - os_ << "//@{" << be_nl - << "/** Component attributes. */"; + os_ << "/** @name Component attributes. */" << be_nl + << "//@{"; Exec_Attr_Decl_Generator attr_decl (&v); @@ -191,14 +192,14 @@ be_visitor_executor_exh::visit_component (be_component *node) os_<< be_nl << "//@}" << be_nl_2; - os_ << "//@{" << be_nl - << "/** User defined members. */"; + os_ << "/** @name User defined members. */" << be_nl + << "//@{"; os_ << be_nl_2 << "//@}"; os_ << be_nl_2 - << "//@{" << be_nl - << "/** User defined private operations. */"; + << "/** @name User defined private operations. */" << be_nl + << "//@{"; os_ << be_nl_2 << "//@}"; 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 fc23b03a257..2a2c076e6c7 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/facet_exh.cpp @@ -77,9 +77,9 @@ be_visitor_facet_exh::visit_provides (be_provides *node) be_interface::narrow_from_decl (impl); os_ << be_nl_2 - << "//@{" << be_nl - << "/** Operations and attributes from ::" - << intf->full_name () << ". */"; + << "/** @name Operations and attributes from " + << intf->full_name () << " */" << be_nl + << "//@{"; int const status = intf->traverse_inheritance_graph ( 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 3855530a33c..a52bf15b18c 100644 --- a/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp +++ b/TAO/TAO_IDL/be/be_visitor_component/servant_svh.cpp @@ -279,7 +279,6 @@ be_visitor_servant_svh::visit_consumes (be_consumes *node) { if(!be_global->gen_noeventccm ()) { - const char *obj_name = node->consumes_type ()->full_name (); const char *port_name = node->local_name ()->get_string (); diff --git a/TAO/TAO_IDL/be/be_visitor_connector.cpp b/TAO/TAO_IDL/be/be_visitor_connector.cpp index 91b8d6f8b32..0e1eb4a9926 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector.cpp @@ -12,6 +12,7 @@ */ //============================================================================= +#include "ast_template_module.h" #include "ast_template_module_inst.h" #include "ast_uses.h" #include "ast_module.h" diff --git a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp index 64e64f2e7b2..9e3715971e7 100644 --- a/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp +++ b/TAO/TAO_IDL/be/be_visitor_connector/connector_dds_ex_base.cpp @@ -28,11 +28,13 @@ be_visitor_connector_dds_ex_base::be_visitor_connector_dds_ex_base ( : be_visitor_component_scope (ctx), t_inst_ (0), t_ref_ (0), + t_params_ (0), base_tname_ (0) { } -be_visitor_connector_dds_ex_base::~be_visitor_connector_dds_ex_base (void) +be_visitor_connector_dds_ex_base::~be_visitor_connector_dds_ex_base ( + void) { } @@ -74,16 +76,20 @@ be_visitor_connector_dds_ex_base::is_dds_type ( { bool result = false; AST_Connector* base = node->base_connector (); + if (base) { while (base->base_connector () != 0) { base = base->base_connector (); } + const char* lname = base->local_name ()->get_string (); + if (ACE_OS::strcmp (lname, "DDS_Base") == 0) { AST_Structure *s = AST_Structure::narrow_from_decl (d); + if (s == 0) { AST_Typedef *td = AST_Typedef::narrow_from_decl (d); @@ -93,15 +99,12 @@ be_visitor_connector_dds_ex_base::is_dds_type ( s = AST_Structure::narrow_from_decl (td->primitive_base_type ()); } } + if (s) { result = true; } } - else - { - // result = idl_global->is_dcps_type (d->name ()); - } } return result; @@ -119,7 +122,6 @@ be_visitor_connector_dds_ex_base::process_template_args ( /// just use the complete template arg list in the /// instantiation. this->t_ref_ = m->from_ref (); - this->t_inst_ = m->from_inst (); /// We assume the connector comes from the instantiation @@ -142,6 +144,13 @@ be_visitor_connector_dds_ex_base::process_template_args ( return; } + /// We need to fetch and store these so we can match them + /// to the corresponding args and determine whether a + /// corresponding boolean template arg (indicating FIXED + /// size type) should be inserted into the + /// connector base class template arg list. + this->t_params_ = this->t_inst_->ref ()->template_params (); + this->match_template_args (); /// We depend on the DDS datatype being the first template 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 7e7eff965df..b7a8cf66f40 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 @@ -93,31 +93,55 @@ be_visitor_connector_dds_exh::visit_connector (be_connector *node) if (this->is_dds_type (node, d)) { os_ << d->flat_name () - << "_DDS_Traits,"; + << "_DDS_Traits"; } else { - os_ << d->name () << ","; + os_ << d->name (); } - AST_Structure *s = AST_Structure::narrow_from_decl (d); - if (s == 0) + bool needs_bool = false; + bool is_fixed = false; + FE_Utils::T_Param_Info *param = 0; + + if (this->t_params_->get (param, slot - 1) != 0) { - AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_connector_dds_exh::") + ACE_TEXT ("visit_connector - ") + ACE_TEXT ("template param fetch failed\n ")), + -1); + } - if (td != 0) - { - s = AST_Structure::narrow_from_decl (td->primitive_base_type ()); - } + if (d->node_type () == AST_Decl::NT_typedef) + { + /// Strip away all layers of typedef before narrowing. + AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + d = td->primitive_base_type (); } - if (s && s->size_type () == AST_Type::VARIABLE) + + /// No need to check if this is 0, but must narrow + /// to call virtual function size_type() below. + AST_Type *t = AST_Type::narrow_from_decl (d); + + switch (param->type_) { - os_ << be_nl << "false"; + case AST_Decl::NT_type: + case AST_Decl::NT_struct: + case AST_Decl::NT_union: + needs_bool = true; + is_fixed = (t->size_type () == AST_Type::FIXED); + break; + default: + break; } - else + + if (needs_bool) { - os_ << be_nl << "true"; + os_ << "," << be_nl + << (is_fixed ? "true" : "false"); } + if (slot < this->t_args_.size ()) { os_ << "," << be_nl; 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 b132ba18b08..feb70be1e8a 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 @@ -67,31 +67,55 @@ be_visitor_connector_dds_exs::visit_connector (be_connector *node) if (this->is_dds_type (node, d)) { os_ << d->flat_name () - << "_DDS_Traits,"; + << "_DDS_Traits"; } else { - os_ << d->name () << ","; + os_ << d->name (); } - AST_Structure *s = AST_Structure::narrow_from_decl (d); - if (s == 0) + bool needs_bool = false; + bool is_fixed = false; + FE_Utils::T_Param_Info *param = 0; + + if (this->t_params_->get (param, slot - 1) != 0) { - AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + ACE_ERROR_RETURN ((LM_ERROR, + ACE_TEXT ("be_visitor_connector_dds_exh::") + ACE_TEXT ("visit_connector - ") + ACE_TEXT ("template param fetch failed\n ")), + -1); + } - if (td != 0) - { - s = AST_Structure::narrow_from_decl (td->primitive_base_type ()); - } + if (d->node_type () == AST_Decl::NT_typedef) + { + /// Strip away all layers of typedef before narrowing. + AST_Typedef *td = AST_Typedef::narrow_from_decl (d); + d = td->primitive_base_type (); } - if (s && s->size_type () == AST_Type::VARIABLE) + + /// No need to check if this is 0, but must narrow + /// to call virtual function size_type() below. + AST_Type *t = AST_Type::narrow_from_decl (d); + + switch (param->type_) { - os_ << be_nl << "false"; + case AST_Decl::NT_type: + case AST_Decl::NT_struct: + case AST_Decl::NT_union: + needs_bool = true; + is_fixed = (t->size_type () == AST_Type::FIXED); + break; + default: + break; } - else + + if (needs_bool) { - os_ << be_nl << "true"; + os_ << "," << be_nl + << (is_fixed ? "true" : "false"); } + if (slot < this->t_args_.size ()) { os_ << "," << be_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 af3fd78dcd4..2693e14f0fe 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 @@ -438,7 +438,7 @@ be_visitor_facet_ami_exs::gen_facet_executor_op (be_operation *node) << "_reply_handler (ami_handler, poa));" << be_nl << "::PortableServer::ServantBase_var owner_transfer (handler);" << be_nl - << "::PortableServer::ObjectId_var oid =" + << "::PortableServer::ObjectId_var oid = " << "poa->activate_object (handler);" << be_nl << "::CORBA::Object_var handler_obj = poa->id_to_reference (oid.in ());" << be_nl 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 7c2e786e46c..c6ebd76e1f9 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_ch.cpp @@ -184,11 +184,11 @@ be_visitor_valuetype_ch::visit_valuetype (be_valuetype *node) << "static " << node->local_name () << "* " << "_downcast ( ::CORBA::ValueBase *v);" << be_nl << be_nl - << "// (TAO extensions or internals)" << be_nl + << "/// TAO extensions or internals" << be_nl << "static ::CORBA::Boolean _tao_unmarshal (" << be_idt << be_idt_nl << "TAO_InputCDR &strm," << be_nl - << node->local_name () << " *&new_object" << be_uidt_nl - << ");" << be_uidt_nl << be_nl + << node->local_name () << " *&new_object);" << be_uidt + << be_uidt_nl << be_nl << "virtual const char* " << "_tao_obv_repository_id (void) const;" << be_nl_2 diff --git a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h index caf8c4860e0..5a7ec54c0ea 100644 --- a/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h +++ b/TAO/TAO_IDL/be_include/be_visitor_connector/connector_dds_ex_base.h @@ -17,6 +17,7 @@ #define _BE_CONNECTOR_CONNECTOR_DDS_EX_BASE_H_ class be_visitor_context; +class AST_Template_Module; class be_visitor_connector_dds_ex_base : public be_visitor_component_scope @@ -46,6 +47,7 @@ protected: AST_Template_Module_Inst *t_inst_; AST_Template_Module_Ref *t_ref_; FE_Utils::T_ARGLIST t_args_; + FE_Utils::T_PARAMLIST_INFO *t_params_; // Derives from the DDS datatype, so we want to calculate it // once and store it. diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index 33ac9e50098..bd73ce8d1ec 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -36,10 +36,10 @@ project(TAO_IDL_EXE) : aceexe, install, tao_output, crosscompile, tao_idl_fe { } verbatim(gnuace, postinstall) { -" @$(MKDIR) $(INSTALL_PREFIX)/share/ace/bin" -" ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(INSTALL_PREFIX)/share/ace/bin" -" @$(MKDIR) $(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)" -" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)" +" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" +" ln -sf $(INSTALL_PREFIX)/bin/tao_idl $(DESTDIR)$(INSTALL_PREFIX)/share/ace/bin" +" @$(MKDIR) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)" +" ln -sf $(INSTALL_PREFIX)/$(INSTALL_LIB)/$(LIB_PREFIX)TAO_IDL_[FB]E.$(SOEXT) $(DESTDIR)$(INSTALL_PREFIX)/share/ace/$(INSTALL_LIB)" } Source_Files { diff --git a/TAO/etc/tao.doxygen b/TAO/etc/tao.doxygen index 1d7afa3a4b0..d76d4730168 100644 --- a/TAO/etc/tao.doxygen +++ b/TAO/etc/tao.doxygen @@ -125,11 +125,11 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC + ACE_INLINE \ + TAO_Export= +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER + #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_anytypecode.doxygen b/TAO/etc/tao_anytypecode.doxygen index 5b3f8b2a2cb..0e5ab250a70 100644 --- a/TAO/etc/tao_anytypecode.doxygen +++ b/TAO/etc/tao_anytypecode.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_av.doxygen b/TAO/etc/tao_av.doxygen index 600aa1796f2..2c4ef8757a5 100644 --- a/TAO/etc/tao_av.doxygen +++ b/TAO/etc/tao_av.doxygen @@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_compression.doxygen b/TAO/etc/tao_compression.doxygen index 2039ad04d61..deec0a17d30 100644 --- a/TAO/etc/tao_compression.doxygen +++ b/TAO/etc/tao_compression.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_cosevent.doxygen b/TAO/etc/tao_cosevent.doxygen index 0abf0e6338a..f8e63aa3aa6 100644 --- a/TAO/etc/tao_cosevent.doxygen +++ b/TAO/etc/tao_cosevent.doxygen @@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_cosnaming.doxygen b/TAO/etc/tao_cosnaming.doxygen index fb073a8bb74..b6eca6ff7ef 100644 --- a/TAO/etc/tao_cosnaming.doxygen +++ b/TAO/etc/tao_cosnaming.doxygen @@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_cosnotification.doxygen b/TAO/etc/tao_cosnotification.doxygen index cefdbf00909..f43b3bcc951 100644 --- a/TAO/etc/tao_cosnotification.doxygen +++ b/TAO/etc/tao_cosnotification.doxygen @@ -134,10 +134,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_costime.doxygen b/TAO/etc/tao_costime.doxygen index bdc96d73ade..b94477dadea 100644 --- a/TAO/etc/tao_costime.doxygen +++ b/TAO/etc/tao_costime.doxygen @@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_costrader.doxygen b/TAO/etc/tao_costrader.doxygen index 4eca2f732c7..a7f565d9ea8 100644 --- a/TAO/etc/tao_costrader.doxygen +++ b/TAO/etc/tao_costrader.doxygen @@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_dynamicany.doxygen b/TAO/etc/tao_dynamicany.doxygen index f79f0043319..16d2bed576c 100644 --- a/TAO/etc/tao_dynamicany.doxygen +++ b/TAO/etc/tao_dynamicany.doxygen @@ -127,10 +127,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_dynamicinterface.doxygen b/TAO/etc/tao_dynamicinterface.doxygen index c240837e86b..47141d66893 100644 --- a/TAO/etc/tao_dynamicinterface.doxygen +++ b/TAO/etc/tao_dynamicinterface.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_esf.doxygen b/TAO/etc/tao_esf.doxygen index 46373c0d91a..946642ed299 100644 --- a/TAO/etc/tao_esf.doxygen +++ b/TAO/etc/tao_esf.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_ifr.doxygen b/TAO/etc/tao_ifr.doxygen index 2e80935d6c4..4c5016191a7 100644 --- a/TAO/etc/tao_ifr.doxygen +++ b/TAO/etc/tao_ifr.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_implrepo.doxygen b/TAO/etc/tao_implrepo.doxygen index 4e6b43b4939..ebf1f644752 100644 --- a/TAO/etc/tao_implrepo.doxygen +++ b/TAO/etc/tao_implrepo.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_iormanip.doxygen b/TAO/etc/tao_iormanip.doxygen index 0561707964c..035065a69da 100644 --- a/TAO/etc/tao_iormanip.doxygen +++ b/TAO/etc/tao_iormanip.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_iortable.doxygen b/TAO/etc/tao_iortable.doxygen index 7eb76951863..89c0d8e7e4a 100644 --- a/TAO/etc/tao_iortable.doxygen +++ b/TAO/etc/tao_iortable.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_pi.doxygen b/TAO/etc/tao_pi.doxygen index b5be0b2867a..1a6ca66d3b0 100644 --- a/TAO/etc/tao_pi.doxygen +++ b/TAO/etc/tao_pi.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_pi_server.doxygen b/TAO/etc/tao_pi_server.doxygen index bc25efc4bef..df393973b5b 100644 --- a/TAO/etc/tao_pi_server.doxygen +++ b/TAO/etc/tao_pi_server.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_portablegroup.doxygen b/TAO/etc/tao_portablegroup.doxygen index 0f75670052c..87ff0db81f2 100644 --- a/TAO/etc/tao_portablegroup.doxygen +++ b/TAO/etc/tao_portablegroup.doxygen @@ -129,10 +129,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_portableserver.doxygen b/TAO/etc/tao_portableserver.doxygen index 87a228ad556..abe30e36444 100644 --- a/TAO/etc/tao_portableserver.doxygen +++ b/TAO/etc/tao_portableserver.doxygen @@ -125,11 +125,10 @@ PREDEFINED = __ACE_INLINE__ \ ACE_END_VERSIONED_NAMESPACE_DECL \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ - ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC + ACE_INLINE \ + TAO_NAMESPACE_STORAGE_CLASS= +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_rtcorba.doxygen b/TAO/etc/tao_rtcorba.doxygen index a4fcaa639ba..f327d455f4d 100644 --- a/TAO/etc/tao_rtcorba.doxygen +++ b/TAO/etc/tao_rtcorba.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_rtevent.doxygen b/TAO/etc/tao_rtevent.doxygen index edec9108e55..d432e2ee3d0 100644 --- a/TAO/etc/tao_rtevent.doxygen +++ b/TAO/etc/tao_rtevent.doxygen @@ -135,10 +135,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_rtportableserver.doxygen b/TAO/etc/tao_rtportableserver.doxygen index b28768d4240..1db620e26fb 100644 --- a/TAO/etc/tao_rtportableserver.doxygen +++ b/TAO/etc/tao_rtportableserver.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_security.doxygen b/TAO/etc/tao_security.doxygen index 2e299dbd542..64e1f3a9ce2 100644 --- a/TAO/etc/tao_security.doxygen +++ b/TAO/etc/tao_security.doxygen @@ -131,10 +131,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_smartproxies.doxygen b/TAO/etc/tao_smartproxies.doxygen index 585cee2403d..83894b34ad1 100644 --- a/TAO/etc/tao_smartproxies.doxygen +++ b/TAO/etc/tao_smartproxies.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_ssliop.doxygen b/TAO/etc/tao_ssliop.doxygen index 5d1fe0ab11d..d0b761a7fbc 100644 --- a/TAO/etc/tao_ssliop.doxygen +++ b/TAO/etc/tao_ssliop.doxygen @@ -131,10 +131,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_strategies.doxygen b/TAO/etc/tao_strategies.doxygen index 10a04d22c6f..c020f47b344 100644 --- a/TAO/etc/tao_strategies.doxygen +++ b/TAO/etc/tao_strategies.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_transportcurrent.doxygen b/TAO/etc/tao_transportcurrent.doxygen index 4fb7755ae42..5c09e787a0b 100644 --- a/TAO/etc/tao_transportcurrent.doxygen +++ b/TAO/etc/tao_transportcurrent.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/etc/tao_ziop.doxygen b/TAO/etc/tao_ziop.doxygen index 69e6dc3ea8b..1c29834d3f6 100644 --- a/TAO/etc/tao_ziop.doxygen +++ b/TAO/etc/tao_ziop.doxygen @@ -126,10 +126,8 @@ PREDEFINED = __ACE_INLINE__ \ TAO_BEGIN_VERSIONED_NAMESPACE_DECL \ TAO_END_VERSIONED_NAMESPACE_DECL \ ACE_INLINE -EXPAND_AS_DEFINED = ACE_RCSID \ - ACE_UNIMPLEMENTED_FUNC \ - ACE_CACHE_MAP_MANAGER \ - ACE_THROW_SPEC +EXPAND_AS_DEFINED = ACE_UNIMPLEMENTED_FUNC \ + ACE_CACHE_MAP_MANAGER #--------------------------------------------------------------------------- # Configuration::additions related to external references diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp index 12b98e9e7bf..a574bc1576e 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.cpp @@ -21,6 +21,14 @@ #include "tao/ORB_Core.h" #include "ace/Reactor.h" + +const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME = + ACE_TEXT("TAOImRActivator"); +const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME = + ACE_TEXT("TAO Implementation Repository Activator"); +const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION = + ACE_TEXT("Implementation Repository Activator service for TAO"); + /** * Handles the SERVICE_CONTROL_SHUTDOWN and SERVICE_CONTROL_STOP commands * by shutting down the ORB. Otherwise ACE_NT_Service::handle_control diff --git a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h index cfbab1aaef5..243cedb6366 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/Activator_NT_Service.h @@ -28,12 +28,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -static const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME = - ACE_TEXT("TAOImRActivator"); -static const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME = - ACE_TEXT("TAO Implementation Repository Activator"); -static const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION = - ACE_TEXT("Implementation Repository Activator service for TAO"); +extern const ACE_TCHAR * IMR_ACTIVATOR_SERVICE_NAME; +extern const ACE_TCHAR * IMR_ACTIVATOR_DISPLAY_NAME; +extern const ACE_TCHAR * IMR_ACTIVATOR_DESCRIPTION; /** * @class Activator_NT_Service diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp index 32d179e1fca..94b4fbc082a 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.cpp @@ -22,6 +22,10 @@ #include "tao/corba.h" #include "ace/Reactor.h" +const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME = ACE_TEXT("TAOImR"); +const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME = ACE_TEXT("TAO Implementation Repository"); +const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION = ACE_TEXT("Implementation Repository Locator service for TAO"); + /** * Handles the SERVICE_CONTROL_SHUTDOWN and SERVICE_CONTROL_STOP commands * by shutting down the ORB. Otherwise ACE_NT_Service::handle_control diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h index e570bdbe151..0d4d2cfe622 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_NT_Service.h @@ -24,9 +24,9 @@ #include "ace/Synch.h" #include "tao/orbconf.h" -static const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME = ACE_TEXT("TAOImR"); -static const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME = ACE_TEXT("TAO Implementation Repository"); -static const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION = ACE_TEXT("Implementation Repository Locator service for TAO"); +extern const ACE_TCHAR* IMR_LOCATOR_SERVICE_NAME; +extern const ACE_TCHAR* IMR_LOCATOR_DISPLAY_NAME; +extern const ACE_TCHAR* IMR_LOCATOR_DESCRIPTION; /** * @class Locator_NT_Service diff --git a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp index 91e58910634..8761db1bbaf 100644 --- a/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp +++ b/TAO/orbsvcs/ImplRepo_Service/Locator_Options.cpp @@ -265,7 +265,7 @@ Options::save_registry_options () LONG err = ACE_TEXT_RegCreateKeyEx (SERVICE_REG_ROOT, SERVICE_REG_PATH, 0, - ACE_TEXT(""), // class + const_cast<ACE_TCHAR*> (ACE_TEXT("")), // class REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, 0, diff --git a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp index 3d8e7d7b357..207468a1c06 100644 --- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp +++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp @@ -2109,7 +2109,7 @@ TAO_StreamEndPoint::change_qos (AVStreams::streamQoS &new_qos, TAO_Forward_FlowSpec_Entry entry; entry.parse (the_flows [i]); ACE_CString flow_name_key (entry.flowname ()); - Flow_Handler_Map_Entry *handler_entry; + Flow_Handler_Map_Entry *handler_entry = 0; if (this->flow_handler_map_.find (flow_name_key, handler_entry) == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp index ee9eac9e287..facf8b9ae78 100644 --- a/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp +++ b/TAO/orbsvcs/orbsvcs/Event/EC_TPC_Dispatching.cpp @@ -184,7 +184,7 @@ TAO_EC_TPC_Dispatching::push_nocopy (TAO_EC_ProxyPushSupplier* proxy, ACE_DEBUG ((LM_DEBUG, "EC (%P|%t) TPC_Dispatching::push_nocopy(supplier=%@,consumer=%@)\n", proxy, consumer)); ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); - TAO_EC_Dispatching_Task* dtask; + TAO_EC_Dispatching_Task* dtask = 0; if (this->consumer_task_map_.find (consumer, dtask) == -1) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 13473a65c1c..56b5157d4a7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -99,7 +99,7 @@ TAO_LB_LoadAverage::push_loads ( { ACE_GUARD (TAO_SYNCH_MUTEX, guard, *this->lock_); - TAO_LB_LoadMap::ENTRY * entry; + TAO_LB_LoadMap::ENTRY * entry = 0; if (this->load_map_->find (the_location, entry) == 0) { CosLoadBalancing::Load & previous_load = entry->int_id_; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 5e3e5b0dadb..ce233f9935f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -168,7 +168,7 @@ TAO_LB_LoadManager::enable_alert (const PortableGroup::Location & the_location) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_); - TAO_LB_LoadAlertMap::ENTRY * entry; + TAO_LB_LoadAlertMap::ENTRY * entry = 0; if (this->load_alert_map_.find (the_location, entry) == 0) { TAO_LB_LoadAlertInfo & info = entry->int_id_; @@ -222,7 +222,7 @@ TAO_LB_LoadManager::disable_alert (const PortableGroup::Location & the_location) { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->load_alert_lock_); - TAO_LB_LoadAlertMap::ENTRY * entry; + TAO_LB_LoadAlertMap::ENTRY * entry = 0; if (this->load_alert_map_.find (the_location, entry) == 0) { TAO_LB_LoadAlertInfo & info = entry->int_id_; @@ -305,7 +305,7 @@ TAO_LB_LoadManager::get_load_alert ( this->load_alert_lock_, CosLoadBalancing::LoadAlert::_nil ()); - TAO_LB_LoadAlertMap::ENTRY * entry; + TAO_LB_LoadAlertMap::ENTRY * entry = 0; if (this->load_alert_map_.find (the_location, entry) == 0) { TAO_LB_LoadAlertInfo & info = entry->int_id_; @@ -405,7 +405,7 @@ TAO_LB_LoadManager::get_load_monitor ( this->monitor_lock_, CosLoadBalancing::LoadMonitor::_nil ()); - TAO_LB_MonitorMap::ENTRY * entry; + TAO_LB_MonitorMap::ENTRY * entry = 0; if (this->monitor_map_.find (the_location, entry) == 0) { return diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 06788d85449..90dd6c015e4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -100,7 +100,7 @@ TAO_LB_LoadMinimum::push_loads ( { ACE_GUARD (TAO_SYNCH_MUTEX, guard, *this->lock_); - TAO_LB_LoadMap::ENTRY * entry; + TAO_LB_LoadMap::ENTRY * entry = 0; if (this->load_map_->find (the_location, entry) == 0) { CosLoadBalancing::Load & previous_load = entry->int_id_; diff --git a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp index f78fcd3feb5..6dfcabcf013 100644 --- a/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp +++ b/TAO/orbsvcs/orbsvcs/Log/Hash_LogStore.cpp @@ -131,7 +131,7 @@ TAO_Hash_LogStore::remove (DsLogAdmin::LogId id) lock_, CORBA::INTERNAL ()); - TAO_Hash_LogRecordStore* recordstore; + TAO_Hash_LogRecordStore* recordstore = 0; int retval = this->hash_map_.unbind (id, recordstore); if (retval == 0) diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp index 54fefd1592b..4a26a14dde9 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_ObjectGroupManager.cpp @@ -339,7 +339,7 @@ TAO_PG_ObjectGroupManager::groups_at_location ( ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, this->lock_, 0); - TAO_PG_ObjectGroup_Array * groups; + TAO_PG_ObjectGroup_Array * groups = 0; if (this->location_map_.find (the_location, groups) == 0) { CORBA::ULong len = static_cast<CORBA::ULong> (groups->size ()); diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp index a51cb373bff..ba010089dc8 100644 --- a/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp +++ b/TAO/orbsvcs/orbsvcs/PortableGroup/Portable_Group_Map.cpp @@ -65,7 +65,7 @@ TAO_Portable_Group_Map::add_groupid_objectkey_pair ( new_entry->key = key; // First, check if the GroupId is already in the map. - Map_Entry *entry; + Map_Entry *entry = 0; if (this->map_.find (group_id, entry) == 0) { diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp index 35a0dc4685b..390fe24f253 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_SecurityManager.cpp @@ -154,7 +154,7 @@ TAO::Security::AccessDecision::access_allowed_i (OBJECT_KEY &key, // Look up the target in access_map_; if there, return the value, // otherwise return the default value. - CORBA::Boolean access_decision; + CORBA::Boolean access_decision = false; if (this->access_map_.find (key, access_decision) == -1) { // Couldn't find the IOR in the map, so we use the default diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index c62439a3a80..547af03b869 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -180,7 +180,7 @@ SecurityLevel3::OwnCredentials_ptr TAO::SL3::CredentialsCurator::get_own_credentials ( const char * credentials_id) { - Credentials_Table::ENTRY * entry; + Credentials_Table::ENTRY * entry = 0; ACE_GUARD_RETURN (TAO_SYNCH_MUTEX, guard, @@ -200,7 +200,7 @@ void TAO::SL3::CredentialsCurator::release_own_credentials ( const char * credentials_id) { - Credentials_Table::ENTRY * entry; + Credentials_Table::ENTRY * entry = 0; ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_); diff --git a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp index 75f9dace3d5..b8156f3dba6 100644 --- a/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp +++ b/TAO/orbsvcs/tests/Concurrency/CC_command.tab.cpp @@ -486,7 +486,7 @@ ace_cc_yyparse(ACE_CC_YYPARSE_PARAM_ARG) ACE_CC_YYSTYPE ace_cc_yyval; /* the variable used to return */ /* semantic values from the action */ /* routines */ - + ace_cc_yyval.id = 0; int ace_cc_yylen; #if ACE_CC_YYDEBUG != 0 diff --git a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc index 237d3ca78fe..f33fc0b431e 100644 --- a/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc +++ b/TAO/tao/BiDir_GIOP/BiDir_GIOP.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \ @@ -10,6 +10,10 @@ project(*idl) : tao_versioning_idl_defaults { -iC BiDir_GIOP BiDirPolicy.pidl } + + specific { + install_dir = tao/BiDir_GIOP + } } project(BiDir_GIOP) : taolib, tao_output, install, pi, taoidldefaults { diff --git a/TAO/tao/CSD_Framework/CSD_Framework.mpc b/TAO/tao/CSD_Framework/CSD_Framework.mpc index 953c08c1cf4..ab92c149e34 100644 --- a/TAO/tao/CSD_Framework/CSD_Framework.mpc +++ b/TAO/tao/CSD_Framework/CSD_Framework.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Sci -SS -Gp -Gd -Sorb -GA -Sal \ @@ -9,6 +9,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St CSD_Framework.pidl } + + specific { + install_dir = tao/CSD_Framework + } } project(CSD_Framework) : taolib, tao_output, portableserver, install, pi, avoids_corba_e_micro, taoidldefaults { diff --git a/TAO/tao/Codeset/Codeset.mpc b/TAO/tao/Codeset/Codeset.mpc index 053997feef6..0f0936fe8fb 100644 --- a/TAO/tao/Codeset/Codeset.mpc +++ b/TAO/tao/Codeset/Codeset.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 idlflags += -SS -Sci -Sorb \ -Wb,export_macro=TAO_Codeset_Export \ @@ -8,6 +8,10 @@ project(*idl) : tao_versioning_idl_defaults { IDL_Files { CodeSetContext.pidl } + + specific { + install_dir = tao/Codeset + } } project(Codeset) : taolib, tao_output, install, taoidldefaults, nolink_codecfactory { diff --git a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc index 673d9f6d0de..27e08e239c8 100644 --- a/TAO/tao/DiffServPolicy/DiffServPolicy.mpc +++ b/TAO/tao/DiffServPolicy/DiffServPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults, tao_no_iiop { +project(*idl) : tao_versioning_idl_defaults, tao_no_iiop, install { custom_only = 1 IDL_Files { idlflags += -GA -SS -Sci -Sorb \ @@ -11,6 +11,10 @@ project(*idl) : tao_versioning_idl_defaults, tao_no_iiop { idlflags -= -St DiffServPolicy.pidl } + + specific { + install_dir = tao/DiffServPolicy + } } project(DiffServPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { diff --git a/TAO/tao/DynamicAny/DynamicAny.mpc b/TAO/tao/DynamicAny/DynamicAny.mpc index 5f317d2c0f8..e0582ec7226 100644 --- a/TAO/tao/DynamicAny/DynamicAny.mpc +++ b/TAO/tao/DynamicAny/DynamicAny.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults, valuetype { +project(*idl) : tao_versioning_idl_defaults, valuetype, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb \ @@ -10,6 +10,10 @@ project(*idl) : tao_versioning_idl_defaults, valuetype { -iC tao/DynamicAny DynamicAny.pidl } + + specific { + install_dir = tao/DynamicAny + } } project(DynamicAny) : install, tao_output, valuetype, taoidldefaults { diff --git a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc index 75e12926c17..297c2c36364 100644 --- a/TAO/tao/EndpointPolicy/EndpointPolicy.mpc +++ b/TAO/tao/EndpointPolicy/EndpointPolicy.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*core_idl) : tao_versioning_idl_defaults { +project(*core_idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -GA -SS -Sci -Sorb \ @@ -11,6 +11,10 @@ project(*core_idl) : tao_versioning_idl_defaults { IIOPEndpointValue.pidl EndpointPolicyType.pidl } + + specific { + install_dir = tao/EndpointPolicy + } } project(EndpointPolicy) : taolib, tao_output, install, portableserver, pi, taoidldefaults, tao_no_iiop, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { diff --git a/TAO/tao/IORInterceptor/IORInterceptor.mpc b/TAO/tao/IORInterceptor/IORInterceptor.mpc index f90275302d3..a103ae5081b 100644 --- a/TAO/tao/IORInterceptor/IORInterceptor.mpc +++ b/TAO/tao/IORInterceptor/IORInterceptor.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -Sa -St \ @@ -18,6 +18,10 @@ project(*idl) : tao_versioning_idl_defaults { -iC IORInterceptor IORInfo.pidl } + + specific { + install_dir = tao/IORInterceptor + } } project(IORInterceptor) : taolib, tao_output, portableserver, objreftemplate, pi, install, taoidldefaults { diff --git a/TAO/tao/IORManipulation/IORManipulation.mpc b/TAO/tao/IORManipulation/IORManipulation.mpc index 5655b20fbe8..91f46408796 100644 --- a/TAO/tao/IORManipulation/IORManipulation.mpc +++ b/TAO/tao/IORManipulation/IORManipulation.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb -GX \ @@ -11,6 +11,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St IOR.pidl } + + specific { + install_dir = tao/IORManipulation + } } project(IORManipulation) : taolib, tao_output, install, anytypecode, taoidldefaults { diff --git a/TAO/tao/IORTable/IORTable.mpc b/TAO/tao/IORTable/IORTable.mpc index fc1ab965264..e7229ec5e68 100644 --- a/TAO/tao/IORTable/IORTable.mpc +++ b/TAO/tao/IORTable/IORTable.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*core_idl) : tao_versioning_idl_defaults { +project(*core_idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Gd -Sci -SS -Sorb \ @@ -10,6 +10,10 @@ project(*core_idl) : tao_versioning_idl_defaults { -iC tao/IORTable IORTable.pidl } + + specific { + install_dir = tao/IORTable + } } project(IORTable) : taolib, tao_output, install, taoidldefaults { diff --git a/TAO/tao/ImR_Client/ImR_Client.mpc b/TAO/tao/ImR_Client/ImR_Client.mpc index 956874ee7d7..6412aa51688 100644 --- a/TAO/tao/ImR_Client/ImR_Client.mpc +++ b/TAO/tao/ImR_Client/ImR_Client.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Gp -Ssi -Gd -Sorb -GA \ @@ -18,6 +18,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St ImplRepo.pidl } + + specific { + install_dir = tao/ImR_Client + } } project(ImR_Client) : taolib, tao_output, install, portableserver, taoidldefaults { diff --git a/TAO/tao/Messaging/Messaging.mpc b/TAO/tao/Messaging/Messaging.mpc index 50554dd7d2e..557d5dc7327 100644 --- a/TAO/tao/Messaging/Messaging.mpc +++ b/TAO/tao/Messaging/Messaging.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -SS -GA -Gp -Gd -Sorb -Sal \ @@ -60,6 +60,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St Messaging.pidl } + + specific { + install_dir = tao/Messaging + } } project(Messaging) : taolib, tao_output, install, portableserver, pi, valuetype, taoidldefaults { diff --git a/TAO/tao/ORB_Core.h b/TAO/tao/ORB_Core.h index 7d335c2f999..a1cdaa60e22 100644 --- a/TAO/tao/ORB_Core.h +++ b/TAO/tao/ORB_Core.h @@ -160,7 +160,7 @@ namespace PortableInterceptor class TAO_Export TAO_ORB_Core { friend class TAO_ORB_Core_Auto_Ptr; - friend CORBA::ORB_ptr CORBA::ORB_init (int &, + friend TAO_Export CORBA::ORB_ptr CORBA::ORB_init (int &, ACE_TCHAR *argv[], const char *); public: diff --git a/TAO/tao/QtResource/QtResource.mpc b/TAO/tao/QtResource/QtResource.mpc index 35b47398ff2..1055dbe4f22 100644 --- a/TAO/tao/QtResource/QtResource.mpc +++ b/TAO/tao/QtResource/QtResource.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- now wouldn't this be cool... // $Id$ -project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qtreactor, taoidldefaults { +project(TAO_QtResource) : acelib, taolib, install, tao_output, taodefaults, ace_qt4reactor, taoidldefaults { sharedname = TAO_QtResource dynamicflags += TAO_QTRESOURCE_BUILD_DLL diff --git a/TAO/tao/Strategies/Strategies.mpc b/TAO/tao/Strategies/Strategies.mpc index 0b2276edc2c..6940d823875 100644 --- a/TAO/tao/Strategies/Strategies.mpc +++ b/TAO/tao/Strategies/Strategies.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*core_idl) : tao_versioning_idl_defaults { +project(*core_idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Sci -SS -Gp -Gd -Sorb -DCORBA3 \ @@ -12,6 +12,9 @@ project(*core_idl) : tao_versioning_idl_defaults { COIOP_Endpoints.pidl } + specific { + install_dir = tao/Strategies + } } project(Strategies) : taolib, tao_output, install, pi, anytypecode, core_strategies, taoidldefaults { diff --git a/TAO/tao/TAO_Internal.cpp b/TAO/tao/TAO_Internal.cpp index da138084306..ca1d1fc3c01 100644 --- a/TAO/tao/TAO_Internal.cpp +++ b/TAO/tao/TAO_Internal.cpp @@ -273,7 +273,7 @@ TAO::ORB::open_global_services (int argc, ACE_TCHAR **argv) ACE_ARGV copyargv (argc, argv, true, true); // Adjust to proper type - int tmpargc = argc; + int tmpargc = copyargv.argc (); // use copied count, not original ACE_Argv_Type_Converter cvtargv (tmpargc, copyargv.argv()); tmpargc = cvtargv.get_argc (); diff --git a/TAO/tao/TransportCurrent/TC.mpc b/TAO/tao/TransportCurrent/TC.mpc index 5998c3eff8d..46bacb2cf03 100644 --- a/TAO/tao/TransportCurrent/TC.mpc +++ b/TAO/tao/TransportCurrent/TC.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : taolib_with_idl, tao_versioning_idl_defaults { +project(*idl) : taolib_with_idl, tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \ @@ -9,6 +9,10 @@ project(*idl) : taolib_with_idl, tao_versioning_idl_defaults { TC.idl } + + specific { + install_dir = tao/TransportCurrent + } } project(TC) : taolib_with_idl, tao_output, taoidldefaults, install, interceptors, pi { diff --git a/TAO/tao/TransportCurrent/TC_IIOP.mpc b/TAO/tao/TransportCurrent/TC_IIOP.mpc index 66630539a00..2f8acb6e99e 100644 --- a/TAO/tao/TransportCurrent/TC_IIOP.mpc +++ b/TAO/tao/TransportCurrent/TC_IIOP.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -Wb,export_include=tao/TransportCurrent/Transport_Current_Export.h \ @@ -9,6 +9,10 @@ project(*idl) : tao_versioning_idl_defaults { TC_IIOP.idl } + + specific { + install_dir = tao/TransportCurrent + } } project(TC_IIOP) : taolib_with_idl, tao_output, taoidldefaults, install, tc, interceptors, pi { diff --git a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc index 2539743304a..328cef556ad 100644 --- a/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc +++ b/TAO/tao/TypeCodeFactory/TypeCodeFactory.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults { +project(*idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags += -SS -Sci -Sorb \ @@ -9,6 +9,10 @@ project(*idl) : tao_versioning_idl_defaults { idlflags -= -Sa -St TypeCodeFactory.pidl } + + specific { + install_dir = tao/TypeCodeFactory + } } project(TypeCodeFactory) : taolib, tao_output, install, ifr_client, taoidldefaults { diff --git a/TAO/tao/Valuetype/ValueBase.h b/TAO/tao/Valuetype/ValueBase.h index b4fd3d790bf..01f74b564cb 100644 --- a/TAO/tao/Valuetype/ValueBase.h +++ b/TAO/tao/Valuetype/ValueBase.h @@ -46,8 +46,8 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL class TAO_Valuetype_Export TAO_ChunkInfo { public: - TAO_ChunkInfo (CORBA::Boolean do_chunking = 0, - CORBA::Long init_level = 0); + TAO_ChunkInfo (CORBA::Boolean do_chunking = false, + CORBA::Long init_level = false); /// Methods to support chunking. /// Note: These methods are called for both chunking and non-chunking diff --git a/TAO/tao/Valuetype/Valuetype.mpc b/TAO/tao/Valuetype/Valuetype.mpc index 5c680db8202..e8414c2477e 100644 --- a/TAO/tao/Valuetype/Valuetype.mpc +++ b/TAO/tao/Valuetype/Valuetype.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*idl) : tao_versioning_idl_defaults, gen_ostream { +project(*idl) : tao_versioning_idl_defaults, gen_ostream, install { custom_only = 1 IDL_Files { idlflags += -SS -Sorb \ @@ -9,6 +9,10 @@ project(*idl) : tao_versioning_idl_defaults, gen_ostream { idlflags -= -St StringValue.pidl } + + specific { + install_dir = tao/Valuetype + } } project(Valuetype) : taolib, tao_output, install, anytypecode, avoids_corba_e_micro, taoidldefaults, gen_ostream, valuetype_out_indirection { diff --git a/TAO/tao/ZIOP/ZIOP.mpc b/TAO/tao/ZIOP/ZIOP.mpc index 0188711fc44..8670b1f52a6 100644 --- a/TAO/tao/ZIOP/ZIOP.mpc +++ b/TAO/tao/ZIOP/ZIOP.mpc @@ -1,5 +1,5 @@ //$Id$ -project(*core_idl) : tao_versioning_idl_defaults { +project(*core_idl) : tao_versioning_idl_defaults, install { custom_only = 1 IDL_Files { idlflags -= -Sa -St @@ -11,6 +11,10 @@ project(*core_idl) : tao_versioning_idl_defaults { -iC tao/ZIOP ZIOP.pidl } + + specific { + install_dir = tao/ZIOP + } } project(ZIOP) : tao_output, install, taolib, compression, pi, taoidldefaults { diff --git a/TAO/tao/tao.mpc b/TAO/tao/tao.mpc index 8d4e8d5c83a..8e354a5a310 100644 --- a/TAO/tao/tao.mpc +++ b/TAO/tao/tao.mpc @@ -55,6 +55,8 @@ project(TAO_Core_idl) : tao_versioning_idl_defaults, gen_ostream, install, pidl_ } PidlInstallWithoutBuilding_Files { + InterfaceDef.pidl + InvalidName.pidl Object_Key.pidl Policy.pidl Typecode_types.pidl @@ -684,7 +686,7 @@ project(TAO) : acelib, install, tao_output, taodefaults, pidl, extra_core, taoid } verbatim(gnuace, postinstall) { -" perl -i -pe's!\\$$[{(]TAO_ROOT[})]!$(INSTALL_PREFIX)/include!g' $(INSTALL_PREFIX)/share/tao/rules.tao.GNU" -" echo export TAO_ROOT=$(INSTALL_PREFIX)/share/tao> $(INSTALL_PREFIX)/share/tao/tao-devel.sh" +" perl -i -pe's!\\$$[{(]TAO_ROOT[})]!$(INSTALL_PREFIX)/include!g' $(DESTDIR)$(INSTALL_PREFIX)/share/tao/rules.tao.GNU" +" echo export TAO_ROOT=$(INSTALL_PREFIX)/share/tao> $(DESTDIR)$(INSTALL_PREFIX)/share/tao/tao-devel.sh" } } diff --git a/TAO/utils/catior/Catior_i.cpp b/TAO/utils/catior/Catior_i.cpp index 454a2d03a37..61520147e0a 100644 --- a/TAO/utils/catior/Catior_i.cpp +++ b/TAO/utils/catior/Catior_i.cpp @@ -504,6 +504,36 @@ Catior_i::cat_tag_orb_type (TAO_InputCDR& stream) { "ORB Type: 0x%x (TAO)\n", orbtype); break; } + case 0x47430000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (GNU Classpath)\n", orbtype); + break; + } + case 0x49540000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (Orbix)\n", orbtype); + break; + } + case 0x4A430000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (JacORB)\n", orbtype); + break; + } + case 0x41540000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (OmniORB)\n", orbtype); + break; + } + case 0x53550000 : + { + ACE_OS::snprintf (buf, bufsize, + "ORB Type: 0x%x (Sun)\n", orbtype); + break; + } case 0x29A: { ACE_OS::snprintf (buf, bufsize, diff --git a/TAO/utils/catior/README.catior b/TAO/utils/catior/README.catior index b26c06d951c..a862cf0d7bb 100644 --- a/TAO/utils/catior/README.catior +++ b/TAO/utils/catior/README.catior @@ -6,10 +6,10 @@ printing out the information contained in it. Usage ----- -catior -f <filename> +tao_catior -f <filename> Takes in a file which contains the IOR and will then output the encoded information to stdout. There are samples file in the test subdirectory. You can run the -"catior" utility against them to see what the output looks like. +"tao_catior" utility against them to see what the output looks like. diff --git a/TAO/utils/logWalker/Session.cpp b/TAO/utils/logWalker/Session.cpp index 7765963e770..c1b429636c2 100644 --- a/TAO/utils/logWalker/Session.cpp +++ b/TAO/utils/logWalker/Session.cpp @@ -87,7 +87,7 @@ Session::default_service (const char *addrspec) HostProcess * Session::find_process (long pid) { - Processes::ENTRY *entry; + Processes::ENTRY *entry = 0; if (this->processes_.find(pid,entry) == 0) return entry->item(); else |