[MICO/mt-commit] CVS: mico/coss/events CosEvent_impl.cc,1.1.1.3,1.2 Makefile,1.1.1.3,1.2 main.cc,1.1.1.2,1.2

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

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

Modified Files:
	CosEvent_impl.cc Makefile main.cc 
Log Message:
- merged with MICO 2.3.7



Index: CosEvent_impl.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/events/CosEvent_impl.cc,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -C2 -r1.1.1.3 -r1.2
*** CosEvent_impl.cc	6 Jan 2001 23:17:42 -0000	1.1.1.3
--- CosEvent_impl.cc	23 Mar 2002 20:17:10 -0000	1.2
***************
*** 55,60 ****
  void ProxyPushConsumer_impl::disconnect_push_consumer ()
  {
!     if (!CORBA::is_nil (supplier) && !supplier->_non_existent()) {
  	supplier->disconnect_push_supplier();
      }
      supplier = CosEventComm::PushSupplier::_nil();
--- 55,67 ----
  void ProxyPushConsumer_impl::disconnect_push_consumer ()
  {
!     if (!CORBA::is_nil (supplier)) {
! #ifdef HAVE_EXCEPTIONS
!       try {
! #endif
  	supplier->disconnect_push_supplier();
+ #ifdef HAVE_EXCEPTIONS
+       } catch (...) {
+       }
+ #endif
      }
      supplier = CosEventComm::PushSupplier::_nil();
***************
*** 80,85 ****
  void ProxyPushSupplier_impl::disconnect_push_supplier ()
  {
!     if (!CORBA::is_nil (consumer) && !consumer->_non_existent()) {
          consumer->disconnect_push_consumer();
      }
      int was_connected = !CORBA::is_nil (consumer);
--- 87,99 ----
  void ProxyPushSupplier_impl::disconnect_push_supplier ()
  {
!     if (!CORBA::is_nil (consumer)) {
! #ifdef HAVE_EXCEPTIONS
!       try {
! #endif
          consumer->disconnect_push_consumer();
+ #ifdef HAVE_EXCEPTIONS
+       } catch (...) {
+       }
+ #endif
      }
      int was_connected = !CORBA::is_nil (consumer);

Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/coss/events/Makefile,v
retrieving revision 1.1.1.3
retrieving revision 1.2
diff -C2 -r1.1.1.3 -r1.2
*** Makefile	8 Feb 2001 15:06:16 -0000	1.1.1.3
--- Makefile	23 Mar 2002 20:17:10 -0000	1.2
***************
*** 1,5 ****
  #
! # MICO --- a free CORBA implementation
! # Copyright (C) 1997 Kay Roemer & Arno Puder
  #
  # This program is free software; you can redistribute it and/or modify
--- 1,5 ----
  #
! #  MICO --- an Open Source CORBA implementation
! #  Copyright (c) 1997-2001 by The Mico Team
  #
  # This program is free software; you can redistribute it and/or modify
***************
*** 17,27 ****
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! # Send comments and/or bug reports to:
! #                mi...@in...
  #
  
  include ../../MakeVars
  
! LDLIBS    = -lmicocoss$(VERSION) -lmico$(VERSION) $(CONFLIBS)
  LDFLAGS  := -L.. -L.. -L../../orb $(LDFLAGS)
  CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS)
--- 17,27 ----
  # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  #
! #  For more information, visit the MICO Home Page at
! #  http://www.mico.org/
  #
  
  include ../../MakeVars
  
! LDLIBS    = $(LDMICOCOSS) $(LDMICO) $(CONFLIBS)
  LDFLAGS  := -L.. -L.. -L../../orb $(LDFLAGS)
  CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS)

Index: main.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/events/main.cc,v
retrieving revision 1.1.1.2
retrieving revision 1.2
diff -C2 -r1.1.1.2 -r1.2
*** main.cc	6 Jan 2001 23:17:42 -0000	1.1.1.2
--- main.cc	23 Mar 2002 20:17:10 -0000	1.2
***************
*** 27,32 ****
--- 27,37 ----
  #include <signal.h>
  #include <unistd.h>
+ #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS
+ #include <iostream>
+ #include <fstream>
+ #else
  #include <iostream.h>
  #include <fstream.h>
+ #endif
  #include <mico/template_impl.h>
  #include <mico/util.h>