micomt-commit

[Karel G. <kg...@us...>]

Update of /cvsroot/micomt/mico/demo/shlib
In directory usw-pr-cvs1:/tmp/cvs-serv31844/demo/shlib

Modified Files:
	client.cc hello hello.idl server.cc 
Log Message:
- merged with MICO 2.3.7



Index: client.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/shlib/client.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** client.cc	3 Nov 1999 23:20:52 -0000	1.1.1.1
--- client.cc	23 Mar 2002 20:17:11 -0000	1.2
***************
*** 37,41 ****
  	return 1;
      }
!     Hello_var h = Hello::_narrow (obj);
      h->hello ("hello world");
      return 0;
--- 37,41 ----
  	return 1;
      }
!     HelloWorld_var h = HelloWorld::_narrow (obj);
      h->hello ("hello world");
      return 0;

Index: hello
===================================================================
RCS file: /cvsroot/micomt/mico/demo/shlib/hello,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hello	3 Nov 1999 23:20:52 -0000	1.1.1.1
--- hello	23 Mar 2002 20:17:11 -0000	1.2
***************
*** 11,15 ****
  trap "kill $micod_pid" 0
  
! imr create Hello library `pwd`/server.s? IDL:Hello:1.0 \
    -ORBImplRepoAddr $ADDR
  
--- 11,15 ----
  trap "kill $micod_pid" 0
  
! imr create HelloWorld library `pwd`/server.s? IDL:HelloWorld:1.0 \
    -ORBImplRepoAddr $ADDR
  

Index: hello.idl
===================================================================
RCS file: /cvsroot/micomt/mico/demo/shlib/hello.idl,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** hello.idl	3 Nov 1999 23:20:52 -0000	1.1.1.1
--- hello.idl	23 Mar 2002 20:17:11 -0000	1.2
***************
*** 1,3 ****
! interface Hello {
    void hello (in string s);
  };
--- 1,3 ----
! interface HelloWorld {
    void hello (in string s);
  };

Index: server.cc
===================================================================
RCS file: /cvsroot/micomt/mico/demo/shlib/server.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** server.cc	3 Nov 1999 23:20:52 -0000	1.1.1.1
--- server.cc	23 Mar 2002 20:17:11 -0000	1.2
***************
*** 26,30 ****
  #include "hello.h"
  
! class Hello_impl : virtual public Hello_skel {
  public:
      void hello (const char *s)
--- 26,30 ----
  #include "hello.h"
  
! class HelloWorld_impl : virtual public HelloWorld_skel {
  public:
      void hello (const char *s)
***************
*** 34,38 ****
  };
  
! static Hello_ptr server = Hello::_nil();
  
  extern "C" CORBA::Boolean
--- 34,38 ----
  };
  
! static HelloWorld_ptr server = HelloWorld::_nil();
  
  extern "C" CORBA::Boolean
***************
*** 41,45 ****
      if (strcmp (version, MICO_VERSION))
  	return FALSE;
!     server = new Hello_impl;
      return TRUE;
  }
--- 41,45 ----
      if (strcmp (version, MICO_VERSION))
  	return FALSE;
!     server = new HelloWorld_impl;
      return TRUE;
  }