3 files changed, 808 insertions, 2 deletions

diff --git a/devel/mico/files/patch-examples::Makefile b/devel/mico/files/patch-examples::Makefile
index ac45d2381b5a..3448308427cf 100644
--- a/devel/mico/files/patch-examples::Makefile
+++ b/devel/mico/files/patch-examples::Makefile
@@ -1,5 +1,5 @@
---- demo/Makefile.orig	Mon Jun 30 05:51:13 2003
-+++ demo/Makefile	Mon Jun 30 05:51:23 2003
+--- demo/Makefile.orig	Fri Feb 14 13:55:57 2003
++++ demo/Makefile	Sun Jul  6 00:26:03 2003
 @@ -27,7 +27,7 @@
  
  RUNDIRS = bench dynany interceptor codesets poa obv mcast generic pi
@@ -9,3 +9,12 @@
  
  ifeq ($(HAVE_DYNAMIC), yes)
  DIRS := $(DIRS) shlib
+@@ -62,7 +62,7 @@
+ endif
+ 
+ ifeq ($(USE_EXTERN), yes)
+-DIRS := $(DIRS) externalize 
++DIRS := $(DIRS) externalization
+ endif
+ 
+ 
diff --git a/devel/mico/files/patch-fixes::externalization b/devel/mico/files/patch-fixes::externalization
new file mode 100644
index 000000000000..919d60c5e04f
--- /dev/null
+++ b/devel/mico/files/patch-fixes::externalization
@@ -0,0 +1,333 @@
+--- coss/externalization/Makefile.orig	Fri Feb 14 13:55:55 2003
++++ coss/externalization/Makefile	Fri Jul  4 15:01:11 2003
+@@ -85,6 +85,8 @@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) extreferenced.o $(LDLIBS) -o extreferenced
+ 	$(POSTLD) $@
+ 
++idlcompile: CosExternalization.cc CosExternalizationContainment.cc CosExternalizationReference.cc
++
+ CosExternalization.h CosExternalization.cc: \
+ 		../../include/coss/CosExternalization.idl $(IDL)
+ 	$(IDL) $(IDLFLAGS) --name CosExternalization \
+--- include/coss/CosStream_impl.h.orig	Fri Jul  4 15:24:06 2003
++++ include/coss/CosStream_impl.h	Fri Jul  4 17:12:36 2003
+@@ -58,8 +58,8 @@
+ 
+ class StreamIO_impl : virtual public POA_CosStream::StreamIO
+ {
+-    istream* istream_;
+-    ostream* ostream_;
++    std::istream* istream_;
++    std::ostream* ostream_;
+     enum in_out
+     {
+ 	in,
+@@ -67,12 +67,12 @@
+     } iotype;
+ 
+ protected:
+-    CORBA::Boolean was_extern(vector<CosObjectIdentity::ObjectIdentifier>* vec_,
++    CORBA::Boolean was_extern(std::vector<CosObjectIdentity::ObjectIdentifier>* vec_,
+ 			      CosObjectIdentity::ObjectIdentifier id);
+ public:
+-    StreamIO_impl(ostream* ostream_ptr = &cout)
++    StreamIO_impl(std::ostream* ostream_ptr = &std::cout)
+ 	: ostream_(ostream_ptr), iotype(out) { };
+-    StreamIO_impl(istream* istream_ptr = &cin)
++    StreamIO_impl(std::istream* istream_ptr = &std::cin)
+ 	: istream_(istream_ptr), iotype(in) { };
+ 
+     virtual void write_string(const char* aString);
+--- include/coss/Externalization_impl.h.orig	Fri Jul  4 18:04:44 2003
++++ include/coss/Externalization_impl.h	Fri Jul  4 18:08:33 2003
+@@ -32,8 +32,8 @@
+ {
+     CORBA::String_var filename_;
+     CosLifeCycle::Key factory_id_;
+-    istream* ifstream_;
+-    ostream* ofstream_;
++    std::istream* ifstream_;
++    std::ostream* ofstream_;
+     CORBA::Boolean context;
+     
+ public:
+--- coss/externalization/Stream_impl.cc.orig	Fri Jul  4 15:30:45 2003
++++ coss/externalization/Stream_impl.cc	Fri Jul  4 16:58:23 2003
+@@ -37,8 +37,10 @@
+ #include <iostream.h>
+ #endif
+ 
+-typedef map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,less<RoleNameKey> > WorkedRoles;
+-typedef map<RoleNameKey,CosGraphs::Role_ptr,less<RoleNameKey> > NewRoles;
++using std::string;
++
++typedef std::map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,std::less<RoleNameKey> > WorkedRoles;
++typedef std::map<RoleNameKey,CosGraphs::Role_ptr,std::less<RoleNameKey> > NewRoles;
+ typedef IfaceSequenceTmpl<CosCompoundExternalization::Node_var,CosCompoundExternalization::Node_ptr> NewNodes;
+ 
+ const char tag_object = 0xF0;
+@@ -135,10 +137,10 @@
+     (*aStreamable).externalize_to_stream(_sio);
+ }
+ 
+-CORBA::Boolean StreamIO_impl::was_extern(vector<CosObjectIdentity::ObjectIdentifier>* vec_,
++CORBA::Boolean StreamIO_impl::was_extern(std::vector<CosObjectIdentity::ObjectIdentifier>* vec_,
+ 					 CosObjectIdentity::ObjectIdentifier id)
+ {
+-    vector<CosObjectIdentity::ObjectIdentifier>::iterator j;
++    std::vector<CosObjectIdentity::ObjectIdentifier>::iterator j;
+     for(j = vec_->begin();j != vec_->end();++j)
+ 	if (*j == id)
+ 	    return TRUE;
+@@ -151,10 +153,10 @@
+     if (iotype != out)
+ 	return;
+     CosStream::StreamIO_ptr _sio = this->_this();
+-    vector<CosObjectIdentity::ObjectIdentifier>* done_nodes =
+-	new vector<CosObjectIdentity::ObjectIdentifier>;
+-    vector<CosObjectIdentity::ObjectIdentifier>* done_rel =
+-	new vector<CosObjectIdentity::ObjectIdentifier>;
++    std::vector<CosObjectIdentity::ObjectIdentifier>* done_nodes =
++	new std::vector<CosObjectIdentity::ObjectIdentifier>;
++    std::vector<CosObjectIdentity::ObjectIdentifier>* done_rel =
++	new std::vector<CosObjectIdentity::ObjectIdentifier>;
+ // Externalize Root Node
+     CosObjectIdentity::ObjectIdentifier starting_node_id = starting_node->constant_random_id();
+ // End
+--- coss/externalization/Externalization_impl.cc.orig	Fri Jul  4 15:28:31 2003
++++ coss/externalization/Externalization_impl.cc	Fri Jul  4 15:28:51 2003
+@@ -37,6 +37,8 @@
+ #include <coss/CosStream_impl.h>
+ #include <coss/RegisterHelper.h>
+ 
++using std::string;
++
+ #ifndef _WIN32
+ Stream_impl::Stream_impl(const char* filename = NULL)
+     : POA_CosExternalization::Stream(),
+--- coss/externalization/extreferenced.cc.orig	Fri Jul  4 17:57:42 2003
++++ coss/externalization/extreferenced.cc	Fri Jul  4 17:58:50 2003
+@@ -34,8 +34,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -65,7 +65,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosExternalizationReference Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosExternalizationReference Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -76,8 +76,8 @@
+ 				type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/externalization/streamd.cc.orig	Fri Jul  4 17:57:59 2003
++++ coss/externalization/streamd.cc	Fri Jul  4 17:59:41 2003
+@@ -38,8 +38,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -67,7 +67,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--trading") == 0 ||
+@@ -77,8 +77,8 @@
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+@@ -111,20 +111,20 @@
+ 	    tr_obj = orb -> resolve_initial_references("TradingService");
+ #ifdef HAVE_EXCEPTIONS
+ 	} catch(CORBA::ORB::InvalidName&) {
+-	    cerr << "Can`t resolve Trading Service. Abort" << endl;
++	    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 	    exit(1);
+ 	}
+ #endif
+ 	if (CORBA::is_nil(tr_obj))
+ 	{
+-	    cerr << "Can`t resolve Trading Service. Abort" << endl;
++	    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 	    exit(1);
+ 	}
+ 	CosTrading::Lookup_var trader_ = CosTrading::Lookup::_narrow (tr_obj);
+ 	CosTrading::Register_var reg = trader_->register_if();
+ 	if (CORBA::is_nil(reg))
+ 	{
+-	    cerr << "Invalid Trading Service. Abort" << endl;
++	    std::cerr << "Invalid Trading Service. Abort" << std::endl;
+ 	    exit(1);
+ 	}
+ 	CORBA::Object_var obj = trader_->type_repos();
+@@ -132,7 +132,7 @@
+ 		CosTradingRepos::ServiceTypeRepository::_narrow(obj);
+ 	if (CORBA::is_nil(repo))
+ 	{
+-	    cerr << "Invalid Trading Service. Abort" << endl;
++	    std::cerr << "Invalid Trading Service. Abort" << std::endl;
+ 	    exit(1);
+ 	}
+ 
+--- coss/externalization/extcriteriad.cc.orig	Fri Jul  4 17:58:08 2003
++++ coss/externalization/extcriteriad.cc	Fri Jul  4 18:00:00 2003
+@@ -37,8 +37,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -63,13 +63,13 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundExternalization::PropagationCriteriaFactory Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundExternalization::PropagationCriteriaFactory Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/externalization/extcontainmentd.cc.orig	Fri Jul  4 18:01:09 2003
++++ coss/externalization/extcontainmentd.cc	Fri Jul  4 18:01:40 2003
+@@ -34,8 +34,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -64,7 +64,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -75,8 +75,8 @@
+ 		        type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/externalization/extnoded.cc.orig	Fri Jul  4 17:35:15 2003
++++ coss/externalization/extnoded.cc	Fri Jul  4 17:35:45 2003
+@@ -34,8 +34,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -64,7 +64,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundExternalization::Node Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundExternalization::Node Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -75,8 +75,8 @@
+ 		    type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- include/coss/CompoundExternalization_impl.h.orig	Sat Jul  5 23:41:43 2003
++++ include/coss/CompoundExternalization_impl.h	Sat Jul  5 23:52:35 2003
+@@ -52,7 +52,7 @@
+ 
+ 	virtual void internalize_node(CosStream::StreamIO_ptr sio,
+                     		      CosLifeCycle::FactoryFinder_ptr there,
+-                		      CosGraphs::Node::Roles*& rolesOfNode);
++                		      CosGraphs::Node::Roles_out rolesOfNode);
+     };
+ 
+ 
+@@ -73,7 +73,7 @@
+     
+ 	friend void CosCompoundExternalization_impl::Node_impl::internalize_node(CosStream::StreamIO_ptr sio,
+                         							 CosLifeCycle::FactoryFinder_ptr there,
+-										 CosGraphs::Node::Roles*& rolesOfNode);
++										 CosGraphs::Node::Roles_out rolesOfNode);
+ 	virtual void externalize_role(CosStream::StreamIO_ptr sio);
+ 
+ 	virtual void internalize_role(CosStream::StreamIO_ptr sio);
+--- coss/externalization/CompoundExternalization_impl.cc.orig	Sat Jul  5 23:14:13 2003
++++ coss/externalization/CompoundExternalization_impl.cc	Sat Jul  5 23:51:29 2003
+@@ -111,7 +111,7 @@
+ void
+ CosCompoundExternalization_impl::Node_impl::internalize_node(CosStream::StreamIO_ptr sio,
+                     					     CosLifeCycle::FactoryFinder_ptr there,
+-                    					     CosGraphs::Node::Roles*& rolesOfNode)
++                    					     CosGraphs::Node::Roles_out rolesOfNode)
+ {
+ //  Node read its non-object data using the primitive StreamIO::read_...(data) function
+     random_id = sio -> read_unsigned_long();
diff --git a/devel/mico/files/patch-fixes::lifecycle b/devel/mico/files/patch-fixes::lifecycle
new file mode 100644
index 000000000000..aa2a4470bfdf
--- /dev/null
+++ b/devel/mico/files/patch-fixes::lifecycle
@@ -0,0 +1,464 @@
+--- coss/lifecycle/Makefile.orig	Fri Feb 14 13:55:55 2003
++++ coss/lifecycle/Makefile	Fri Jul  4 12:33:15 2003
+@@ -101,6 +101,8 @@
+ 	$(CXX) $(CXXFLAGS) $(LDFLAGS) genericfactory.o $(LDLIBS) -o genericfactory
+ 	$(POSTLD) $@
+ 
++idlcompile: CosLifeCycle.cc CosCompoundLifeCycle.cc CosLifeCycleContainment.cc CosLifeCycleReference.cc
++
+ CosLifeCycle.h CosLifeCycle.cc: \
+ 		../../include/coss/CosLifeCycle.idl $(IDL)
+ 	$(IDL) $(IDLFLAGS) --name CosLifeCycle \
+--- coss/lifecycle/FactoryFinder_impl.cc.orig	Fri Jul  4 14:44:09 2003
++++ coss/lifecycle/FactoryFinder_impl.cc	Fri Jul  4 16:44:03 2003
+@@ -28,6 +28,8 @@
+ #include <coss/FactoryFinder_impl.h>
+ #include <string>
+ 
++using std::string;
++
+ FactoryFinder_impl::FactoryFinder_impl()
+ #ifndef _WIN32
+     : POA_CosLifeCycle::FactoryFinder ()
+@@ -61,13 +63,13 @@
+ 				nm_obj = orb -> resolve_initial_references("NameService");
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+-				cerr << "Can`t resolve Naming Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ #endif
+ 			if (CORBA::is_nil(nm_obj))
+ 			{
+-				cerr << "Can`t resolve Naming Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ 			naming_ = CosNaming::NamingContext::_narrow (nm_obj);
+@@ -82,13 +84,13 @@
+ 				tr_obj = orb -> resolve_initial_references("TradingService");
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+-				cerr << "Can`t resolve Trading Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ #endif
+ 			if (CORBA::is_nil(tr_obj))
+ 			{
+-				cerr << "Can`t resolve Trading Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ 			trader_ = CosTrading::Lookup::_narrow (tr_obj);
+--- coss/lifecycle/GenericFactory_impl.cc.orig	Fri Jul  4 14:47:28 2003
++++ coss/lifecycle/GenericFactory_impl.cc	Fri Jul  4 16:19:21 2003
+@@ -25,6 +25,7 @@
+ #include <CORBA.h>
+ #include <coss/GenericFactory_impl.h>
+ 
++using std::string;
+ 
+ GenericFactory_impl::GenericFactory_impl (void)
+ #ifndef _WIN32
+@@ -58,13 +59,13 @@
+ 					nm_obj = orb -> resolve_initial_references("NameService");
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+-				cerr << "Can`t resolve Naming Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ #endif
+ 			if (CORBA::is_nil(nm_obj))
+ 			{
+-				cerr << "Can`t resolve Naming Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ 			naming_ = CosNaming::NamingContext::_narrow (nm_obj);
+@@ -79,13 +80,13 @@
+ 				tr_obj = orb -> resolve_initial_references("TradingService");
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+-				cerr << "Can`t resolve Trading Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ #endif
+ 			if (CORBA::is_nil(tr_obj))
+ 			{
+-				cerr << "Can`t resolve Trading Service. Abort" << endl;
++			    std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 				exit(1);
+ 			}
+ 			trader_ = CosTrading::Lookup::_narrow (tr_obj);
+@@ -404,8 +405,8 @@
+ 	if (!strcmp(factory_key[3].id.in(),""))
+ 		return CORBA::Object::_nil();
+ 
+-    CORBA::String_var filter_ = (char *)NULL;
+-    CORBA::String_var preferences = (char *)NULL;
++    const char* filter_ = NULL;
++    const char* preferences = NULL;
+     CORBA::ULong i;
+     for(i = 0;i < the_criteria.length();++i)
+ 	if (!strcmp(the_criteria[i].name,"filter"))
+@@ -505,13 +506,13 @@
+ 	add_ += filter;
+ 	filter = add_;
+     }
+-    if (filter.size() && filter_.in())
++    if (filter.size() && filter_ != NULL)
+     {
+ 	string add_;
+ 	add_ += "(";
+ 	add_ += filter;
+ 	add_ += ") and ";
+-	add_ += filter_.in();
++	add_ += filter_;
+ 	filter = add_;
+     }
+     
+--- coss/lifecycle/Operations_impl.cc.orig	Fri Jul  4 16:41:53 2003
++++ coss/lifecycle/Operations_impl.cc	Fri Jul  4 16:42:53 2003
+@@ -30,9 +30,9 @@
+ #include <list>
+ #include <algorithm>
+ 
+-typedef map<RoleKey,CosGraphs::Role_ptr,less<RoleKey> > WorkedRoles;
+-typedef list<CosObjectIdentity::ObjectIdentifier> WorkedRelationships;
+-typedef list<CosGraphs::Traversal::TraversalScopedId> WorkedNodes;
++typedef std::map<RoleKey,CosGraphs::Role_ptr,std::less<RoleKey> > WorkedRoles;
++typedef std::list<CosObjectIdentity::ObjectIdentifier> WorkedRelationships;
++typedef std::list<CosGraphs::Traversal::TraversalScopedId> WorkedNodes;
+ 
+ Operations_impl::Operations_impl()
+ #ifndef _WIN32
+@@ -142,7 +142,7 @@
+ #endif
+     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
+     {
+-	if (find(workedRelationships.begin(),
++	if (std::find(workedRelationships.begin(),
+ 		  workedRelationships.end(),
+ 		  (*OriginalEdgeList)[i].the_relationship.scoped_relationship.constant_random_id) !=
+ 	   workedRelationships.end())
+@@ -251,7 +251,7 @@
+ 	    ex.reason = CORBA::string_dup("Node not supported CosCompoundLifeCycle::Node interface.");
+ 	    mico_throw (ex);
+ 	}
+-	if (find(MovedNodes.begin(),MovedNodes.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
++	if (std::find(MovedNodes.begin(),MovedNodes.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
+ 		MovedNodes.end())
+ 	    continue;
+ 	current_node_ptr->move_node(there,the_criteria);
+@@ -290,7 +290,7 @@
+ 
+     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
+     {
+-	if (find(Rel4Remove.begin(),Rel4Remove.end(),
++	if (std::find(Rel4Remove.begin(),Rel4Remove.end(),
+ 		(*OriginalEdgeList)[i].the_relationship.scoped_relationship.constant_random_id) !=
+ 	    Rel4Remove.end())
+ 	    continue;
+@@ -316,7 +316,7 @@
+ #endif
+     for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
+     {
+-	if (find(Nodes4Remove.begin(),Nodes4Remove.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
++	if (std::find(Nodes4Remove.begin(),Nodes4Remove.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
+ 	    Nodes4Remove.end())
+ 	    continue;
+ 	CosCompoundLifeCycle::Node_ptr tmp_node_ptr =
+--- coss/lifecycle/RegisterHelper.cc.orig	Fri Jul  4 16:44:17 2003
++++ coss/lifecycle/RegisterHelper.cc	Fri Jul  4 16:45:17 2003
+@@ -45,7 +45,7 @@
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+ #if DEBUG
+-	    		cerr << "Can`t resolve Naming Service." << endl;
++			    std::cerr << "Can`t resolve Naming Service." << std::endl;
+ #endif
+ 			}
+ #endif
+@@ -64,7 +64,7 @@
+ #ifdef HAVE_EXCEPTIONS
+ 			} catch(CORBA::ORB::InvalidName&) {
+ #if DEBUG
+-	    		cerr << "Can`t resolve Trading Service." << endl;
++			    std::cerr << "Can`t resolve Trading Service." << std::endl;
+ #endif
+ 			}
+ #endif
+@@ -121,14 +121,14 @@
+ {
+ 	if (CORBA::is_nil(_obj))
+ 	{
+-		cerr << "Can`t resolve Naming Service. Abort" << endl;
+-		return FALSE;
++	    std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
++	    return FALSE;
+ 	}
+ 	CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow(_obj);
+ 	if (CORBA::is_nil(nc.in()))
+ 	{
+-		cerr << "Invalid Naming Service. Abort" << endl;
+-		return FALSE;
++	    std::cerr << "Invalid Naming Service. Abort" << std::endl;
++	    return FALSE;
+ 	}
+ 	CosNaming::Name full(4);
+ 	full.length(4);
+@@ -173,14 +173,14 @@
+ {
+     if (CORBA::is_nil(_obj))
+     {
+-	cerr << "Can`t resolve Trading Service. Abort" << endl;
++	std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
+ 	return FALSE;
+     }
+     CosTrading::Lookup_var trader_ = CosTrading::Lookup::_narrow (_obj);
+     CosTrading::Register_var reg = trader_->register_if();
+     if (CORBA::is_nil(reg))
+     {
+-	cerr << "Invalid Trading Service. Abort" << endl;
++	std::cerr << "Invalid Trading Service. Abort" << std::endl;
+ 	return FALSE;
+     }
+     CORBA::Object_var obj = trader_->type_repos();
+@@ -188,7 +188,7 @@
+ 	CosTradingRepos::ServiceTypeRepository::_narrow(obj);
+     if (CORBA::is_nil(repo))
+     {
+-	cerr << "Invalid Trading Service. Abort" << endl;
++	std::cerr << "Invalid Trading Service. Abort" << std::endl;
+ 	return FALSE;
+     }
+ 
+--- coss/lifecycle/lifenoded.cc.orig	Fri Jul  4 17:16:08 2003
++++ coss/lifecycle/lifenoded.cc	Fri Jul  4 17:17:41 2003
+@@ -36,8 +36,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++        std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -66,7 +66,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundLifeCycle::Node Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundLifeCycle::Node Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -81,8 +81,8 @@
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/lifecontainmentd.cc.orig	Fri Jul  4 17:22:32 2003
++++ coss/lifecycle/lifecontainmentd.cc	Fri Jul  4 17:23:15 2003
+@@ -36,8 +36,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -65,7 +65,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosLifeCycleContainment Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosLifeCycleContainment Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -80,8 +80,8 @@
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/lifereferenced.cc.orig	Fri Jul  4 17:24:49 2003
++++ coss/lifecycle/lifereferenced.cc	Fri Jul  4 17:25:32 2003
+@@ -36,8 +36,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -67,7 +67,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosLifeCycleReference Service Factories is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosLifeCycleReference Service Factories is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -82,8 +82,8 @@
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/operationd.cc.orig	Fri Jul  4 17:26:48 2003
++++ coss/lifecycle/operationd.cc	Fri Jul  4 17:27:22 2003
+@@ -30,8 +30,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -56,13 +56,13 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundLifeCycle::OperationsFactory Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundLifeCycle::OperationsFactory Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/lifecriteriad.cc.orig	Fri Jul  4 17:29:24 2003
++++ coss/lifecycle/lifecriteriad.cc	Fri Jul  4 17:29:58 2003
+@@ -38,8 +38,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -64,13 +64,13 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosCompoundLifeCycle::PropagationCriteriaFactory Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosCompoundLifeCycle::PropagationCriteriaFactory Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/factoryfinderd.cc.orig	Fri Jul  4 17:31:06 2003
++++ coss/lifecycle/factoryfinderd.cc	Fri Jul  4 17:31:36 2003
+@@ -29,8 +29,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -58,7 +58,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosLifeCycle::FactoryFinder Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosLifeCycle::FactoryFinder Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -69,8 +69,8 @@
+ 			type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}
+--- coss/lifecycle/genericfactory.cc.orig	Fri Jul  4 17:32:54 2003
++++ coss/lifecycle/genericfactory.cc	Fri Jul  4 17:33:21 2003
+@@ -29,8 +29,8 @@
+ static void
+ usage(const char* progName)
+ {
+-	cerr << "Usage:\n";
+-	cerr << progName << " [options]\n"
++    	std::cerr << "Usage:\n";
++	std::cerr << progName << " [options]\n"
+ 	"\n"
+ 	"Options:\n"
+ 	"-h, --help                Show this message.\n"
+@@ -58,7 +58,7 @@
+ 	else if(strcmp(argv[i], "--version") == 0 ||
+ 		strcmp(argv[i], "-v") == 0)
+ 	{
+-	    cerr << "Version of CosLifeCycle::GenericFactory Service is " << MICO_VERSION << endl;
++	    std::cerr << "Version of CosLifeCycle::GenericFactory Service is " << MICO_VERSION << std::endl;
+ 	    return 0;
+ 	}
+ 	else if(strcmp(argv[i], "--with-naming") == 0 ||
+@@ -69,8 +69,8 @@
+ 			type = RegisterHelper::trading;
+ 	else
+ 	{
+-	    cerr << progName << ": unknown option `"
+-		 << argv[i] << "'\n" << endl;
++	    std::cerr << progName << ": unknown option `"
++		 << argv[i] << "'\n" << std::endl;
+ 	    usage(progName);
+ 	    return 1;
+ 	}