[MICO/mt-commit] CVS: mico/coss/externalization Stream_impl.cc,1.1.1.1,1.2 extcriteriad.cc,1.1.1.1,1.2

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

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

Modified Files:
	Stream_impl.cc extcriteriad.cc 
Log Message:
- merged with MICO 2.3.7



Index: Stream_impl.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/externalization/Stream_impl.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** Stream_impl.cc	6 Jan 2001 23:17:43 -0000	1.1.1.1
--- Stream_impl.cc	23 Mar 2002 20:17:10 -0000	1.2
***************
*** 32,36 ****
--- 32,40 ----
  #include <list>
  #include <algorithm>
+ #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS
  #include <iostream>
+ #else
+ #include <iostream.h>
+ #endif
  
  typedef map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,less<RoleNameKey> > WorkedRoles;

Index: extcriteriad.cc
===================================================================
RCS file: /cvsroot/micomt/mico/coss/externalization/extcriteriad.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** extcriteriad.cc	6 Jan 2001 23:17:43 -0000	1.1.1.1
--- extcriteriad.cc	23 Mar 2002 20:17:10 -0000	1.2
***************
*** 24,29 ****
--- 24,35 ----
  
  
+ #include <CORBA.h>
+ #ifdef HAVE_ANSI_CPLUSPLUS_HEADERS
+ #include <iostream>
+ #include <fstream>
+ #else
  #include <iostream.h>
  #include <fstream.h>
+ #endif
  #include <unistd.h>
  #include <mico/ExternalizationPropagationCriteriaFactory_impl.h>