[MICO/mt-commit] CVS: mico/coss/naming Makefile,1.7,1.8 NamingClient.cc,1.10,1.11 Naming_impl.cc,1.11,1.12 nsd.cc,1.12,1.13

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

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

Modified Files:
	Makefile NamingClient.cc Naming_impl.cc nsd.cc 
Log Message:
- merged with MICO 2.3.7



Index: Makefile
===================================================================
RCS file: /cvsroot/micomt/mico/coss/naming/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Makefile	15 Mar 2001 18:52:13 -0000	1.7
--- Makefile	23 Mar 2002 20:17:10 -0000	1.8
***************
*** 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,28 ****
  # 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)
! ALLLIBS   = -lmicocoss$(VERSION) -lmico$(VERSION) $(CURSESLIBS) $(CONFLIBS)
  LDFLAGS  := -L.. -L../../orb $(LDFLAGS)
  CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS)
--- 17,28 ----
  # 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)
! ALLLIBS   = $(LDMICOCOSS) $(LDMICO) $(CURSESLIBS)
  LDFLAGS  := -L.. -L../../orb $(LDFLAGS)
  CXXFLAGS := -I. -I../../include $(CXXFLAGS) $(EHFLAGS)

Index: NamingClient.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/naming/NamingClient.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** NamingClient.cc	15 Mar 2001 18:52:13 -0000	1.10
--- NamingClient.cc	23 Mar 2002 20:17:10 -0000	1.11
***************
*** 342,347 ****
    {
        if(i<0) str << '/';
!       str << name[i].id;
!       if(strlen(name[i].kind)>0) str << '.' << name[i].kind;
    }
  }
--- 342,347 ----
    {
        if(i<0) str << '/';
!       str << name[i].id.in();
!       if(strlen(name[i].kind.in())>0) str << '.' << name[i].kind.in();
    }
  }

Index: Naming_impl.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/naming/Naming_impl.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** Naming_impl.cc	8 Jan 2001 16:55:31 -0000	1.11
--- Naming_impl.cc	23 Mar 2002 20:17:10 -0000	1.12
***************
*** 23,28 ****
--- 23,33 ----
  
  #include <CORBA.h>
+ #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS
+ #include <iostream>
+ #include <fstream>
+ #else
  #include <iostream.h>
  #include <fstream.h>
+ #endif
  #include <Naming_impl.h>
  #include <mico/util.h>

Index: nsd.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/naming/nsd.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** nsd.cc	25 Aug 2001 18:41:15 -0000	1.12
--- nsd.cc	23 Mar 2002 20:17:10 -0000	1.13
***************
*** 28,33 ****
--- 28,38 ----
  #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>
***************
*** 195,205 ****
      }
      else {
!     ofstream out (reffile.c_str());
!     if (!out) {
  	cerr << "error: cannot open output file " << reffile << endl;
!     }
!     else {
  	out << nsior << endl;
!       out.close ();
        }
      }
--- 200,210 ----
      }
      else {
!       ofstream out (reffile.c_str());
!       if (!out) {
  	cerr << "error: cannot open output file " << reffile << endl;
!       }
!       else {
  	out << nsior << endl;
! 	out.close ();
        }
      }