diff options
9 files changed, 38 insertions, 17 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 40b12d55e9a..f83329f7f2d 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1,3 +1,27 @@ +Sat May 17 11:05:40 2003 Nanbor Wang <nanbor@cs.wustl.edu> + + * examples/handcrafted/BasicSP/BasicSP.idl: Changed to include + "CCM_Components.idl" directly instead of + "ciao/CCM_Components.idl". + + * examples/handcrafted/BasicSP/BasicSP.mpc: Removed BasicSPC.cpp + from the svnt library source file list since we are linking with + BasicSP stub library already. Removed BasicSPES.cpp from the + source file list also because it's basically empty. + + * examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc: The stub and + svnt libraries should depends on BasicSP_stub library instead of + themselves. + + * examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h: Fixed + incorrect usage of extern "C" and export macro. + + * examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt.h: Changed + the use of BMDEVICE_STUB_Export macro to BMDEVICE_SVNT_Export. + + * examples/handcrafted/BasicSP/EC/EC_svnt.cpp: The start () + operation should not return anything. + Fri May 16 18:11:42 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * examples/handcrafted/BasicSP/BMDisplay/BMDisplay.idl (BasicSP): diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc index b4767b45514..8ad523aa469 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice.mpc @@ -1,9 +1,12 @@ // $Id$ project(BMDevice_stub): ciao_client { - depends += BMDevice_stub + depends += BasicSP_stub sharedname = BMDevice_stub + idlflags += -Wb,stub_export_macro=BMDEVICE_STUB_Export -Wb,stub_export_include=BMDevice_stub_export.h -Wb,skel_export_macro=BMDEVICE_SVNT_Export -Wb,skel_export_include=BMDevice_svnt_export.h + libpaths += .. + libs += BasicSP_stub dllflags = BMDEVICE_STUB_BUILD_DLL IDL_Files { @@ -16,7 +19,7 @@ project(BMDevice_stub): ciao_client { } project(BMDevice_svnt) : ciao_server { - depends += BMDevice_svnt BMDevice_stub + depends += BMDevice_stub BasicSP_stub sharedname = BMDevice_svnt libs += BMDevice_stub BasicSP_stub BasicSP_svnt libpaths += .. @@ -50,10 +53,7 @@ project(BMDevice_exec) : ciao_server { Source_Files { BMDeviceES.cpp BMDeviceEIC.cpp - BMDeviceEIS.cpp + BMDeviceEIS.cpp BMDevice_exec.cpp } } - - - diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h index 5f85d0ddff7..55576bc3966 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_exec.h @@ -112,9 +112,7 @@ namespace MyImpl // Executor DLL entry point. CIAO's deployment and assembly framework // invokes this function on the resulting DLL to get the home executor. -extern "C" BMDEVICE_EXEC_Export { - ::Components::HomeExecutorBase_ptr - createBMDeviceHome_Impl (void); -} +extern "C" BMDEVICE_EXEC_Export ::Components::HomeExecutorBase_ptr +createBMDeviceHome_Impl (void); #endif /* CIAO_BMDEVICE_EXEC_H*/ diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt.h b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt.h index 282246a2d31..e3743eb211f 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt.h +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BMDevice/BMDevice_svnt.h @@ -127,7 +127,7 @@ namespace CIAO_GLUE_BasicSP BasicSP::BMDevice_var component_; }; - class BMDEVICE_STUB_Export BMDevice_Servant + class BMDEVICE_SVNT_Export BMDevice_Servant : public virtual POA_BasicSP::BMDevice, // full skeleton name here public virtual PortableServer::RefCountServantBase { diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl index 93bbb362123..700dee47903 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.idl @@ -12,7 +12,7 @@ #ifndef CIAO_BASIC_SP_IDL #define CIAO_BASIC_SP_IDL -#include "ciao/CCM_Component.idl" +#include "CCM_Component.idl" // @@NOTE: Do we need a pragma prefix. Anyway its broken now in TAO.. // #pragma prefix "" diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc index 50f34474a1a..f9cb71dc1e5 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc +++ b/TAO/CIAO/examples/handcrafted/BasicSP/BasicSP.mpc @@ -29,10 +29,8 @@ project(BasicSP_svnt) : ciao_server { } Source_Files { - BasicSPC.cpp - BasicSPS.cpp BasicSPEC.cpp - BasicSPES.cpp + BasicSPS.cpp BasicSP_svnt.cpp } } diff --git a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp index 6e7508760f8..c7d1cb86168 100644 --- a/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp +++ b/TAO/CIAO/examples/handcrafted/BasicSP/EC/EC_svnt.cpp @@ -642,7 +642,7 @@ CIAO_GLUE_BasicSP::EC_Servant::start (ACE_ENV_SINGLE_ARG_DECL) { cout << "Amba Here ?? " << endl; // Simply relay to executor. May not need to return the result... - return this->executor_->start (ACE_ENV_SINGLE_ARG_PARAMETER); + this->executor_->start (ACE_ENV_SINGLE_ARG_PARAMETER); } void diff --git a/TAO/CIAO/examples/handcrafted/Hello/CIAO_Installation_Data.ini b/TAO/CIAO/examples/handcrafted/Hello/CIAO_Installation_Data.ini index 7eb0600bad5..30e49defa84 100644 --- a/TAO/CIAO/examples/handcrafted/Hello/CIAO_Installation_Data.ini +++ b/TAO/CIAO/examples/handcrafted/Hello/CIAO_Installation_Data.ini @@ -1,3 +1,3 @@ [ComponentInstallation] -DCE:530a6305-8181-47ca-bd82-0b834016db97=hello_executors DCE:05833d92-4783-4b85-ac14-e2575dac26f7=hello_servants +DCE:530a6305-8181-47ca-bd82-0b834016db97=hello_executors diff --git a/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.cpp b/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.cpp index a52dbd9c177..4606366dd7a 100644 --- a/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.cpp +++ b/TAO/CIAO/tools/Simple_Component_Server/Simple_Component_Server.cpp @@ -44,6 +44,7 @@ parse_args (int argc, char *argv[]) default: ACE_ERROR_RETURN ((LM_ERROR, "usage: %s\n" + "-c instantiate the component" "-i <component config file>\n" "-o <server_ior_output_file>" "\n", |