diff options
Diffstat (limited to 'TAO/docs/tutorials')
20 files changed, 54 insertions, 300 deletions
diff --git a/TAO/docs/tutorials/Quoter/AMI/Makefile.am b/TAO/docs/tutorials/Quoter/AMI/Makefile.am index 8b2c868579f..06b7f62661a 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Makefile.am +++ b/TAO/docs/tutorials/Quoter/AMI/Makefile.am @@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = @@ -22,7 +22,6 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS BUILT_SOURCES = \ QuoterC.cpp \ @@ -47,10 +46,10 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl @touch $@ + noinst_HEADERS = \ Quoter.idl -endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc index 8230799791a..b19033fbef3 100644 --- a/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc +++ b/TAO/docs/tutorials/Quoter/AMI/Quoter_AMI.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami { custom_only = 1 } -project(*client) : taoexe, portableserver, ami { +project(*client) : taoexe, portableserver, ami, exceptions { after += *idl source_files { client.cpp @@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, ami { } } -project(*server) : taoserver, ami { +project(*server) : taoserver, ami, exceptions { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am index 59ec0863011..6636df72e21 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Event_Service/Makefile.am @@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = ## Makefile.Quoter_Event_Service_Idl.am -if BUILD_EXCEPTIONS - BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -45,14 +43,14 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl @touch $@ + noinst_HEADERS = \ Quoter.idl -endif BUILD_EXCEPTIONS - ## Makefile.Quoter_Event_Service_Client.am if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -80,11 +78,13 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Makefile.Quoter_Event_Service_Server.am if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -115,6 +115,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc index 9d9eb79afc7..a98f1720c63 100644 --- a/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Event_Service/Quoter_Event_Service.mpc @@ -8,7 +8,7 @@ project(*idl) : taoidldefaults, anytypecode { custom_only = 1 } -project(*client) : orbsvcsexe, portableserver, event, event_skel, naming { +project(*client) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions { after += *idl source_files { client.cpp @@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, event, event_skel, naming { } } -project(*server) : orbsvcsexe, portableserver, event, event_skel, naming { +project(*server) : orbsvcsexe, portableserver, event, event_skel, naming, minimum_corba, exceptions { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Makefile.am b/TAO/docs/tutorials/Quoter/Makefile.am index 83aa0ad74b0..9a0053b5806 100644 --- a/TAO/docs/tutorials/Quoter/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Makefile.am @@ -12,7 +12,6 @@ SUBDIRS = \ AMI \ Event_Service \ On_Demand_Activation \ - RTCORBA \ RT_Event_Service \ idl \ Simple \ diff --git a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc index 28cb1412d21..797e2569292 100644 --- a/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc +++ b/TAO/docs/tutorials/Quoter/Naming_Service/Quoter_Naming_Service.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : orbsvcsexe, portableserver, naming { +project(*client) : orbsvcsexe, portableserver, naming, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : orbsvcsexe, portableserver, naming { } } -project(*server) : orbsvcsexe, portableserver, naming { +project(*server) : orbsvcsexe, portableserver, naming, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am index 4f278eeebf3..29035de8f99 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Makefile.am @@ -13,7 +13,7 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = @@ -22,7 +22,6 @@ noinst_PROGRAMS = if BUILD_AMI if BUILD_CORBA_MESSAGING -if BUILD_EXCEPTIONS BUILT_SOURCES = \ QuoterC.cpp \ @@ -47,10 +46,10 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -GC $(srcdir)/Quoter.idl @touch $@ + noinst_HEADERS = \ Quoter.idl -endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -59,6 +58,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -88,6 +88,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI @@ -97,6 +98,7 @@ endif BUILD_AMI if BUILD_AMI if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -130,6 +132,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING endif BUILD_AMI diff --git a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc index d68df58bb9b..650bdc9d832 100644 --- a/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc +++ b/TAO/docs/tutorials/Quoter/On_Demand_Activation/Quoter_On_Demand_Activation.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, ami { custom_only = 1 } -project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*client) : taoexe, portableserver, naming, ami, minimum_corba, exceptions { after += *idl source_files { client.cpp @@ -20,7 +20,7 @@ project(*client) : taoexe, portableserver, naming, ami, avoids_minimum_corba, av } } -project(*server) : taoserver, naming, ami, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*server) : taoserver, naming, ami, minimum_corba, exceptions { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am b/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am deleted file mode 100644 index 4b87d4e87ec..00000000000 --- a/TAO/docs/tutorials/Quoter/RTCORBA/Makefile.am +++ /dev/null @@ -1,249 +0,0 @@ -## Process this file with automake to create Makefile.in -## -## $Id$ -## -## This file was generated by MPC. Any changes made directly to -## this file will be lost the next time it is generated. -## -## MPC Command: -## ../bin/mwc.pl -type automake -noreldefs TAO.mwc - -ACE_BUILDDIR = $(top_builddir)/.. -ACE_ROOT = $(top_srcdir)/.. -TAO_BUILDDIR = $(top_builddir) -TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf -TAO_ROOT = $(top_srcdir) - -CLEANFILES = -noinst_PROGRAMS = -BUILT_SOURCES = - -## Makefile.RTCORBA_Quoter_Common.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA - -BUILT_SOURCES += \ - DistributorC.cpp \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl - -CLEANFILES += \ - Distributor-stamp \ - DistributorC.cpp \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl - -DistributorC.cpp DistributorC.h DistributorC.inl DistributorS.inl: Distributor-stamp - -Distributor-stamp: $(srcdir)/Distributor.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Distributor.idl - @touch $@ - -BUILT_SOURCES += \ - BrokerC.cpp \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl - -CLEANFILES += \ - Broker-stamp \ - BrokerC.cpp \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl - -BrokerC.cpp BrokerC.h BrokerC.inl BrokerS.inl: Broker-stamp - -Broker-stamp: $(srcdir)/Broker.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Broker.idl - @touch $@ - -BUILT_SOURCES += \ - CommonC.cpp \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl - -CLEANFILES += \ - Common-stamp \ - CommonC.cpp \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl - -CommonC.cpp CommonC.h CommonC.inl CommonS.h CommonS.inl: Common-stamp - -Common-stamp: $(srcdir)/Common.idl $(TAO_IDL_DEP) - $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,stub_export_macro=RTCORBA_Quoter_Common_Export -Wb,stub_export_include=Common_Export.h $(srcdir)/Common.idl - @touch $@ - -noinst_LTLIBRARIES = libRTCORBA_Quoter_Common.la - -libRTCORBA_Quoter_Common_la_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -DRTCORBA_QUOTER_COMMON_BUILD_DLL - -libRTCORBA_Quoter_Common_la_SOURCES = \ - BrokerC.cpp \ - CommonC.cpp \ - DistributorC.cpp \ - Stock_PriorityMapping.cpp - -noinst_HEADERS = \ - Broker.idl \ - BrokerC.h \ - BrokerC.inl \ - BrokerS.inl \ - Common.idl \ - CommonC.h \ - CommonC.inl \ - CommonS.h \ - CommonS.inl \ - Distributor.idl \ - DistributorC.h \ - DistributorC.inl \ - DistributorS.inl \ - Stock_PriorityMapping.h - -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Admin.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Admin - -Admin_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Admin_SOURCES = \ - Admin.cpp - -Admin_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Broker.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Broker - -Broker_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Broker_SOURCES = \ - Broker.cpp \ - BrokerS.cpp \ - Broker_i.cpp \ - CommonS.cpp \ - StockNameConsumer_i.cpp \ - BrokerS.h \ - Broker_i.h \ - StockNameConsumer_i.h \ - Stock_Database.h - -Broker_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Makefile.RTCORBA_Quoter_Distributor.am - -if BUILD_EXCEPTIONS -if BUILD_RT_CORBA -if BUILD_STL - -noinst_PROGRAMS += Distributor - -Distributor_CPPFLAGS = \ - -I$(ACE_ROOT) \ - -I$(ACE_BUILDDIR) \ - -I$(TAO_ROOT) \ - -I$(TAO_BUILDDIR) \ - -I$(TAO_ROOT)/orbsvcs \ - -I$(TAO_BUILDDIR)/orbsvcs - -Distributor_SOURCES = \ - CommonS.cpp \ - Distributor.cpp \ - DistributorS.cpp \ - Distributor_i.cpp \ - DistributorS.h \ - Distributor_i.h \ - Stock_Database.h - -Distributor_LDADD = \ - libRTCORBA_Quoter_Common.la \ - $(TAO_BUILDDIR)/tao/libTAO_Utils.la \ - $(TAO_BUILDDIR)/orbsvcs/orbsvcs/libTAO_CosNaming.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTPortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_RTCORBA.la \ - $(TAO_BUILDDIR)/tao/libTAO_PortableServer.la \ - $(TAO_BUILDDIR)/tao/libTAO_PI.la \ - $(TAO_BUILDDIR)/tao/libTAO_CodecFactory.la \ - $(TAO_BUILDDIR)/tao/libTAO_Valuetype.la \ - $(TAO_BUILDDIR)/tao/libTAO_AnyTypeCode.la \ - $(TAO_BUILDDIR)/tao/libTAO.la \ - $(ACE_BUILDDIR)/ace/libACE.la - -endif BUILD_STL -endif BUILD_RT_CORBA -endif BUILD_EXCEPTIONS - -## Clean up template repositories, etc. -clean-local: - -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* - -rm -f gcctemp.c gcctemp so_locations *.ics - -rm -rf cxx_repository ptrepository ti_files - -rm -rf templateregistry ir.out - -rm -rf ptrepository SunWS_cache Templates.DB diff --git a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp index 8fe636bcd96..2e5698c1c71 100644 --- a/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp +++ b/TAO/docs/tutorials/Quoter/RTCORBA/StockNameConsumer_i.cpp @@ -1,4 +1,3 @@ -// $Id$ // local headers #include "StockNameConsumer_i.h" @@ -24,7 +23,7 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna i < the_stockname->names ().length (); ++i) { - if (ACE_OS::strcmp (this->stock_name_, + if (ACE_OS::strcmp (this->stock_name_, the_stockname->names ()[i]) == 0) { // Get the quoter for the connection from the <context_>. @@ -32,7 +31,7 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna "*** message: getting the quoter connection\n")); Stock::StockQuoter_var quoter = this->context_.get_connection_quoter_info (); - + try { // Request more information from the StockQuoter. @@ -40,10 +39,10 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna "*** message: requesting the stock info from the quoter\n")); Stock::StockInfo_var stock_info = quoter->get_stock_info (the_stockname->names()[i]); - + // Display the current value of the stock. ACE_DEBUG ((LM_DEBUG, - "Current value of %s is $%d\n", + "Current value of %s is $%d\n", stock_info->name.in (), stock_info->last)); } @@ -60,14 +59,14 @@ void Stock_StockNameConsumer_i::push_StockName (::Stock::StockNames *the_stockna } -::Stock::Cookie * +::Stock::Cookie * Stock_StockNameConsumer_i::cookie () throw (::CORBA::SystemException) { return this->cookie_.in (); } -void +void Stock_StockNameConsumer_i::cookie (::Stock::Cookie *cookie) throw (::CORBA::SystemException) { diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am index f18f6763052..5fcd5c51cc1 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Makefile.am @@ -13,15 +13,13 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) noinst_PROGRAMS = ## Makefile.Quoter_RT_Event_Service_Idl.am -if BUILD_EXCEPTIONS - BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -45,16 +43,16 @@ Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) $(srcdir)/Quoter.idl @touch $@ + noinst_HEADERS = \ Quoter.idl -endif BUILD_EXCEPTIONS - ## Makefile.Quoter_RT_Event_Service_Client.am if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += client @@ -87,6 +85,7 @@ client_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING @@ -96,6 +95,7 @@ endif BUILD_CORBA_MESSAGING if BUILD_CORBA_MESSAGING if BUILD_EXCEPTIONS if !BUILD_ACE_FOR_TAO +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS += server @@ -131,6 +131,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif !BUILD_ACE_FOR_TAO endif BUILD_EXCEPTIONS endif BUILD_CORBA_MESSAGING diff --git a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc index 9fce32b5ba3..15cb6b2be5b 100644 --- a/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc +++ b/TAO/docs/tutorials/Quoter/RT_Event_Service/Quoter_RT_Event_Service.mpc @@ -8,7 +8,7 @@ project(*idl): taoidldefaults, anytypecode { custom_only = 1 } -project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions { after += *idl source_files { client.cpp @@ -19,7 +19,7 @@ project(*client) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_mini } } -project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project(*server) : orbsvcsexe, portableserver, rtevent_serv, naming, minimum_corba, exceptions { after += *idl source_files { server.cpp diff --git a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc index 39350e69199..d1f999594f1 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Client/Quoter_Simple_Client.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taoexe, portableserver { +project : taoexe, portableserver, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc index d66ed413d6e..e15b2b37572 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Impl-Repo/Quoter_Simple_Impl_Repo.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver, rtevent, naming { +project(*client) : taoexe, portableserver, rtevent, naming, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : taoexe, portableserver, rtevent, naming { } } -project(*server) : taoserver, rtevent, naming, iortable { +project(*server) : taoserver, rtevent, naming, iortable, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am index 02535fa4295..b66ca814609 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Makefile.am @@ -17,6 +17,7 @@ TAO_ROOT = $(top_srcdir) ## Makefile.Quoter_Simple_ImprovedServer.am if BUILD_EXCEPTIONS +if !BUILD_MINIMUM_CORBA noinst_PROGRAMS = server @@ -42,6 +43,7 @@ server_LDADD = \ $(TAO_BUILDDIR)/tao/libTAO.la \ $(ACE_BUILDDIR)/ace/libACE.la +endif !BUILD_MINIMUM_CORBA endif BUILD_EXCEPTIONS ## Clean up template repositories, etc. diff --git a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc index 67da7604b8e..fda3b450dd6 100644 --- a/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/ImprovedServer/Quoter_Simple_ImprovedServer.mpc @@ -1,5 +1,5 @@ // $Id$ -project : taoserver, avoids_minimum_corba, avoids_corba_e_compact, avoids_corba_e_micro { +project : taoserver, minimum_corba, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc index 5685980514b..c8c3a2ad4ae 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Persistent/Quoter_Simple_Persistent.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project(*client) : taoexe, portableserver { +project(*client) : taoexe, portableserver, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib @@ -15,7 +15,7 @@ project(*client) : taoexe, portableserver { } } -project(*server) : taoserver, avoids_corba_e_micro { +project(*server) : taoserver, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc index 5cbce4fb41e..dc8789b784c 100644 --- a/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc +++ b/TAO/docs/tutorials/Quoter/Simple/Server/Quoter_Simple_Server.mpc @@ -1,7 +1,7 @@ // -*- MPC -*- // $Id$ -project : taoserver { +project : taoserver, exceptions { libs += Quoter_Idl_Lib after += Quoter_Idl_Lib diff --git a/TAO/docs/tutorials/Quoter/idl/Makefile.am b/TAO/docs/tutorials/Quoter/idl/Makefile.am index 8e882c13c78..5670be7df9e 100644 --- a/TAO/docs/tutorials/Quoter/idl/Makefile.am +++ b/TAO/docs/tutorials/Quoter/idl/Makefile.am @@ -13,14 +13,11 @@ ACE_ROOT = $(top_srcdir)/.. TAO_BUILDDIR = $(top_builddir) TAO_IDL = ACE_ROOT=$(ACE_ROOT) TAO_ROOT=$(TAO_ROOT) $(TAO_BUILDDIR)/TAO_IDL/tao_idl TAO_IDL_DEP = $(TAO_BUILDDIR)/TAO_IDL/tao_idl -TAO_IDLFLAGS = -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf +TAO_IDLFLAGS = -Ge 1 -Wb,pre_include=ace/pre.h -Wb,post_include=ace/post.h -I$(TAO_ROOT) -I$(srcdir) -g $(ACE_BUILDDIR)/apps/gperf/src/gperf TAO_ROOT = $(top_srcdir) - ## Makefile.Quoter_Idl_Lib.am -if BUILD_EXCEPTIONS - BUILT_SOURCES = \ QuoterC.cpp \ QuoterC.h \ @@ -29,7 +26,8 @@ BUILT_SOURCES = \ QuoterS.h \ QuoterS.inl \ QuoterS_T.cpp \ - QuoterS_T.h + QuoterS_T.h \ + QuoterS_T.inl CLEANFILES = \ Quoter-stamp \ @@ -40,9 +38,10 @@ CLEANFILES = \ QuoterS.h \ QuoterS.inl \ QuoterS_T.cpp \ - QuoterS_T.h + QuoterS_T.h \ + QuoterS_T.inl -QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h: Quoter-stamp +QuoterC.cpp QuoterC.h QuoterC.inl QuoterS.cpp QuoterS.h QuoterS.inl QuoterS_T.cpp QuoterS_T.h QuoterS_T.inl: Quoter-stamp Quoter-stamp: $(srcdir)/Quoter.idl $(TAO_IDL_DEP) $(TAO_IDL) $(TAO_IDLFLAGS) -Wb,export_macro=QUOTER_COMMON_Export -Wb,export_include=quoter_common_export.h -GT $(srcdir)/Quoter.idl @@ -67,11 +66,11 @@ noinst_HEADERS = \ QuoterC.inl \ QuoterS.h \ QuoterS.inl \ + QuoterS_T.cpp \ QuoterS_T.h \ + QuoterS_T.inl \ quoter_common_export.h -endif BUILD_EXCEPTIONS - ## Clean up template repositories, etc. clean-local: -rm -f *~ *.bak *.rpo *.sym lib*.*_pure_* core core.* diff --git a/TAO/docs/tutorials/Quoter/index.html b/TAO/docs/tutorials/Quoter/index.html index 26c6fc4b8ca..d910ceafd98 100644 --- a/TAO/docs/tutorials/Quoter/index.html +++ b/TAO/docs/tutorials/Quoter/index.html @@ -42,7 +42,7 @@ files for which links are provided. If you choose to build and run the example, however, use the files which are part of the TAO source you <A - HREF="http://download.dre.vanderbilt.edu">download</a>. You can + HREF="http://deuce.doc.wustl.edu/Download.html">download</a>. You can find those source files in <CODE>$TAO_ROOT/docs/tutorials/Quoter</CODE>, where there's also a Makefile to build them with. Downloading the files individually from these links may result in source that does not build |