From: Karel G. <kg...@us...> - 2002-03-23 20:17:50
|
Update of /cvsroot/micomt/mico/demo/ccm/hello In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/ccm/hello Modified Files: Makefile README hello_impl.cc Log Message: - merged with MICO 2.3.7 Index: Makefile =================================================================== RCS file: /cvsroot/micomt/mico/demo/ccm/hello/Makefile,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** Makefile 6 Jul 2001 22:15:07 -0000 1.1 --- Makefile 23 Mar 2002 20:17:11 -0000 1.2 *************** *** 6,10 **** INSTALL_DIR = ccm/hello ! INSTALL_SRCS = Makefile client.cc hello.idl INSTALL_SCRIPTS = hello --- 6,10 ---- INSTALL_DIR = ccm/hello ! INSTALL_SRCS = README Makefile client.cc hello.idl hello_impl.cc INSTALL_SCRIPTS = hello *************** *** 27,31 **** hello_ccm.cc hello_ccm.h: hello.idl ! $(CCMGEN) $^ hello.cc hello.h: hello.idl --- 27,31 ---- hello_ccm.cc hello_ccm.h: hello.idl ! $(CCMGEN) --standalone $^ hello.cc hello.h: hello.idl Index: README =================================================================== RCS file: /cvsroot/micomt/mico/demo/ccm/hello/README,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** README 6 Jul 2001 22:15:07 -0000 1.1 --- README 23 Mar 2002 20:17:11 -0000 1.2 *************** *** 11,12 **** --- 11,13 ---- interface, configures the message to "Hello World", and then calls sayHello. + This one builds the component into a standalone server. Index: hello_impl.cc =================================================================== RCS file: /cvsroot/micomt/mico/demo/ccm/hello/hello_impl.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -r1.1 -r1.2 *** hello_impl.cc 6 Jul 2001 22:15:07 -0000 1.1 --- hello_impl.cc 23 Mar 2002 20:17:11 -0000 1.2 *************** *** 1,4 **** ! #include "hello_ccm.h" class HelloWorld_impl : virtual public CCM_HelloWorld { --- 1,4 ---- ! #include "hello.h" class HelloWorld_impl : virtual public CCM_HelloWorld { *************** *** 23,27 **** class HelloHome_impl : virtual public CCM_HelloHome { public: ! CCM_HelloWorld * create () { return new HelloWorld_impl; --- 23,27 ---- class HelloHome_impl : virtual public CCM_HelloHome { public: ! Components::EnterpriseComponent_ptr create () { return new HelloWorld_impl; *************** *** 30,35 **** extern "C" { ! CCM_HelloHome * ! create_HelloHome () { return new HelloHome_impl; --- 30,34 ---- extern "C" { ! Components::HomeExecutorBase_ptr create_HelloHome () { return new HelloHome_impl; |