Attachment #32867 for bug #54117

Lines 7-13 Link Here

(-)mico/Makefile (-8 / +22 lines)
7		7
8	PORTNAME= mico	8	PORTNAME= mico
9	PORTVERSION= 2.3.10	9	PORTVERSION= 2.3.10
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= http://www.mico.org/	12	MASTER_SITES= http://www.mico.org/
13		13
Lines 25-32 Link Here
25	.if defined(WITH_GCC32)	25	.if defined(WITH_GCC32)
26	USE_GCC= 3.2	26	USE_GCC= 3.2
27	.endif	27	.endif
28	CONFIGURE_ARGS+= --enable-cd --disable-mini-stl --enable-threads \	28
29	--enable-ccm	29	CONFIGURE_ARGS= --enable-cd --disable-mini-stl --enable-threads
		30	.if !defined(WITHOUT_SERVICES)
		31	CONFIGURE_ARGS+= --enable-ccm --enable-life
		32	.else
		33	CONFIGURE_ARGS+= --disable-coss
		34	MICO_SERVICE= "@comment "
		35	.endif
		36
30	CONFIGURE_ENV+= CXXFLAGS=${CPPFLAGS}	37	CONFIGURE_ENV+= CXXFLAGS=${CPPFLAGS}
31		38
32	.if defined(WITH_X11)	39	.if defined(WITH_X11)
Lines 60-78 Link Here
60		67
61	.include <bsd.port.pre.mk>	68	.include <bsd.port.pre.mk>
62		69
63	.if defined(WITHOUT_SSL)	70	.if defined(WITHOUT_SSL) \|\| defined(WITHOUT_SERVICES)
64	MICO_SSL= "@comment "	71	MICO_SSL= "@comment "
65	.else	72	.else
66	USE_OPENSSL= yes	73	USE_OPENSSL= yes
67	CONFIGURE_ARGS+= --enable-ssl=${OPENSSLBASE} --enable-csiv2	74	CONFIGURE_ARGS+= --enable-ssl=${OPENSSLBASE}
		75	CONFIGURE_ARGS+= --enable-csiv2
		76	#
68	# CORBASecV2 doesn't build with gcc32 port because FlexLexer.h absent	77	# CORBASecV2 doesn't build with gcc32 port because FlexLexer.h absent
		78	#
69	.if !( ${OSVERSION} < 500035 && defined(WITH_GCC32) )	79	.if !( ${OSVERSION} < 500035 && defined(WITH_GCC32) )
70	CONFIGURE_ARGS+= --enable-csl2	80	CONFIGURE_ARGS+= --enable-csl2
71	.endif	81	.endif
72	.endif	82	.endif
73		83
74	PLIST_SUB+= MICO_X11=${MICO_X11} MICO_QT=${MICO_QT} MICO_GTK=${MICO_GTK} \	84	PLIST_SUB+= MICO_X11=${MICO_X11} MICO_QT=${MICO_QT} MICO_GTK=${MICO_GTK} \
75	MICO_TCL=${MICO_TCL} MICO_SSL=${MICO_SSL}	85	MICO_TCL=${MICO_TCL} MICO_SSL=${MICO_SSL} \
		86	MICO_SERVICE=${MICO_SERVICE}
76		87
77	MAN1= idl.1 imr.1 nsadmin.1	88	MAN1= idl.1 imr.1 nsadmin.1
78	MAN5= micorc.5	89	MAN5= micorc.5
Lines 85-91 Link Here
85	@${ECHO}	96	@${ECHO}
86	.endif	97	.endif
87	@${ECHO} "Following options are allowed:"	98	@${ECHO} "Following options are allowed:"
88	@${ECHO} "WITHOUT_SSL=yes, WITH_X11=yes, WITH_QT=yes, WITH_GTK=yes, WITH_TCL=yes"	99	@${ECHO}
		100	@${ECHO} "WITHOUT_SERVICES=yes - build without services, only ORB"
		101	@${ECHO} "WITHOUT_SSL=yes - build without SSL and security services"
		102	@${ECHO} "WITH_X11=yes, WITH_QT=yes, WITH_GTK=yes, WITH_TCL=yes"
89	@${ECHO} "============================================================================"	103	@${ECHO} "============================================================================"
90		104
91	post-extract:	105	post-extract:
Lines 99-105 Link Here
99	${REINPLACE_CMD} -e "s#/doc/mico/examples#/share/examples/mico#"	113	${REINPLACE_CMD} -e "s#/doc/mico/examples#/share/examples/mico#"
100	${REINPLACE_CMD} -e "s#/doc/mico/examples#/share/examples/mico#" ${WRKSRC}/demo/MakeVars	114	${REINPLACE_CMD} -e "s#/doc/mico/examples#/share/examples/mico#" ${WRKSRC}/demo/MakeVars
101	${REINPLACE_CMD} -e "s#ministl##" ${WRKSRC}/include/Makefile	115	${REINPLACE_CMD} -e "s#ministl##" ${WRKSRC}/include/Makefile
102	${RM} ${WRKSRC}/include/mico/*.orig	116	${RM} ${WRKSRC}/include/mico/.orig ${WRKSRC}/include/coss/.orig
103		117
104	post-install:	118	post-install:
105	@for i in `${GREP} '^lib/lib.*so$$' ${TMPPLIST}`; do \	119	@for i in `${GREP} '^lib/lib.*so$$' ${TMPPLIST}`; do \




--- 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;
 	}




--- 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;
 	}

Lines 19-24 Link Here

(-)mico/pkg-descr (-1 / +1 lines)
19	* CORBA Services:	19	* CORBA Services:
20	o Interoperable Naming service, o Trading service, o Event service,	20	o Interoperable Naming service, o Trading service, o Event service,
21	o Relationship service, o Property service, o Time service,	21	o Relationship service, o Property service, o Time service,
22	o Security service	22	o Security service, o Lifecycle service
23		23
24	WWW: http://www.mico.org	24	WWW: http://www.mico.org




%%MICO_SERVICE%%bin/ccmload
%%MICO_SERVICE%%bin/componentserver
%%MICO_SERVICE%%bin/containmentd
%%MICO_SERVICE%%bin/eventd
bin/idl
bin/imr
bin/iordump
bin/ird
%%MICO_SERVICE%%bin/lifecontainmentd
%%MICO_SERVICE%%bin/lifenoded
%%MICO_SERVICE%%bin/lifereferenced
bin/mico-ar
bin/mico-c++
%%MICO_SERVICE%%bin/mico-ccm
%%MICO_SERVICE%%bin/mico-ccmd
bin/mico-cpp
bin/mico-ld
bin/mico-shc++
bin/mico-shld
bin/micod
%%MICO_SERVICE%%bin/noded
%%MICO_SERVICE%%bin/nsadmin
%%MICO_SERVICE%%bin/nsd
%%MICO_SERVICE%%bin/operationd
%%MICO_SERVICE%%bin/propertyd
%%MICO_SERVICE%%bin/proxyd
%%MICO_SERVICE%%bin/randomd
%%MICO_SERVICE%%bin/referenced
%%MICO_SERVICE%%bin/timed
%%MICO_SERVICE%%bin/traderd
%%MICO_SERVICE%%bin/traversald
include/CORBA-SMALL.h
include/CORBA.h
include/coss/CompoundExternalization_impl.h
%%MICO_SERVICE%%include/coss/CosCompoundLifeCycle.h
include/coss/CosCompoundLifeCycle.idl
%%MICO_SERVICE%%include/coss/CosContainment.h
include/coss/CosContainment.idl
include/coss/CosContainment_impl.h
%%MICO_SERVICE%%include/coss/CosEventChannelAdmin.h
include/coss/CosEventChannelAdmin.idl
%%MICO_SERVICE%%include/coss/CosEventComm.h
include/coss/CosEventComm.idl
include/coss/CosExternalization.idl
include/coss/CosExternalizationContainment.idl
include/coss/CosExternalizationReference.idl
%%MICO_SERVICE%%include/coss/CosGraphs.h
include/coss/CosGraphs.idl
%%MICO_SERVICE%%include/coss/CosGraphsExtension.h
include/coss/CosGraphsExtension.idl
%%MICO_SERVICE%%include/coss/CosLifeCycle.h
include/coss/CosLifeCycle.idl
%%MICO_SERVICE%%include/coss/CosLifeCycleContainment.h
include/coss/CosLifeCycleContainment.idl
%%MICO_SERVICE%%include/coss/CosLifeCycleReference.h
include/coss/CosLifeCycleReference.idl
%%MICO_SERVICE%%include/coss/CosNaming.h
include/coss/CosNaming.idl
%%MICO_SERVICE%%include/coss/CosObjectIdentity.h
include/coss/CosObjectIdentity.idl
%%MICO_SERVICE%%include/coss/CosReference.h
include/coss/CosReference.idl
include/coss/CosReference_impl.h
%%MICO_SERVICE%%include/coss/CosRelationships.h
include/coss/CosRelationships.idl
include/coss/CosStream_impl.h
%%MICO_SERVICE%%include/coss/CosTime.h
include/coss/CosTime.idl
%%MICO_SERVICE%%include/coss/CosTrading.h
include/coss/CosTrading.idl
%%MICO_SERVICE%%include/coss/CosTradingRepos.h
include/coss/CosTradingRepos.idl
include/coss/EdgeIterator_impl.h
include/coss/ExternalizationContainment_impl.h

include/coss/Node_impl.h
include/coss/OperationsFactory_impl.h
include/coss/Operations_impl.h
%%MICO_SERVICE%%include/coss/PropertyService.h
include/coss/PropertyService.idl
include/coss/PropertyService_impl.h
%%MICO_SERVICE%%include/coss/RandomGenerator.h
include/coss/RandomGenerator.idl
include/coss/RandomGenerator_impl.h
include/coss/RegisterHelper.h

include/coss/TraversalCriteria_impl.h
include/coss/TraversalFactory_impl.h
include/coss/Traversal_impl.h
%%MICO_SERVICE%%include/coss/random.h
include/coss/random.idl
%%MICO_SERVICE%%include/coss/stream.h
include/coss/stream.idl
include/coss/stream_impl.h
include/mico/CCM.h

lib/libmicoaux2.3.10.a
lib/libmicoaux2.3.10.so
lib/libmicoaux2.3.10.so.1
%%MICO_SERVICE%%lib/libmicoccm2.3.10.a
%%MICO_SERVICE%%lib/libmicoccm2.3.10.so
%%MICO_SERVICE%%lib/libmicoccm2.3.10.so.1
%%MICO_SERVICE%%lib/libmicocoss2.3.10.a
%%MICO_SERVICE%%lib/libmicocoss2.3.10.so
%%MICO_SERVICE%%lib/libmicocoss2.3.10.so.1
%%MICO_GTK%%lib/libmicogtk2.3.10.a
%%MICO_GTK%%lib/libmicogtk2.3.10.so
%%MICO_GTK%%lib/libmicogtk2.3.10.so.1

%%PORTDOCS%%share/examples/mico/boa/activate/hello-unshared
%%PORTDOCS%%share/examples/mico/boa/activate/hello.idl
%%PORTDOCS%%share/examples/mico/boa/activate/server.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/README
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/channel.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/channel_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/consumer.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/consumer_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/events
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/message.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/message_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/message_impl.h
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/producer.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/events/producer_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/README
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/hello
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/hello.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello/hello_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/README
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/hello
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/hello.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/hello2/hello_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/README
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/philo
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/philo.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/philo_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/ccm/philo/tkobserver.cc
%%PORTDOCS%%share/examples/mico/codesets/Makefile
%%PORTDOCS%%share/examples/mico/codesets/client.cc
%%PORTDOCS%%share/examples/mico/codesets/hello.idl

%%PORTDOCS%%share/examples/mico/interop/visibroker/account
%%PORTDOCS%%share/examples/mico/interop/visibroker/main.cc
%%PORTDOCS%%share/examples/mico/interop/visibroker/run_applet
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/hello.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/runit
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/lifecycle/server.cc
%%PORTDOCS%%share/examples/mico/mcast/Makefile
%%PORTDOCS%%share/examples/mico/mcast/client.cc
%%PORTDOCS%%share/examples/mico/mcast/hello.idl

%%PORTDOCS%%%%MICO_SSL%%share/examples/mico/security/tutorial/ssl
%%PORTDOCS%%share/examples/mico/services/Makefile
%%PORTDOCS%%share/examples/mico/services/README
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/client2.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/runit
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server2.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/events/server3.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Documents.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/DocumentsServer.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Documents_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Documents_impl.h
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/README
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Test.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/TestServer.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Test_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/Test_impl.h
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/daemons-start
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/daemons-stop
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/rundemo
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/servers-start
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/simple-test.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/stop-servers
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/lifecycle/test
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Printer.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Printer_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Printer_impl.h
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/Server.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming-lb/printer_test
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/account.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/account_test
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/naming/server.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/README
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/bank.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/get_properties.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/set_properties.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/property-daemon/start_demo
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Documents.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/DocumentsServer.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Documents_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Documents_impl.h
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/README
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Test.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/TestServer.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Test_impl.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/Test_impl.h
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/daemons-start
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/daemons-stop
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/rundemo
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/servers-start
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/simple-test.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/stop-servers
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/relship/test
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/bench
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/req.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/req_client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/req_server.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/stream_client.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/stream-bench/stream_server.cc
%%PORTDOCS%%share/examples/mico/services/stream-sound/Makefile
%%PORTDOCS%%share/examples/mico/services/stream-sound/client.cc
%%PORTDOCS%%share/examples/mico/services/stream-sound/server.cc
%%PORTDOCS%%share/examples/mico/services/stream-sound/sound.h
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/trader/Makefile
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/trader/demo.idl
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/trader/main.cc
%%PORTDOCS%%%%MICO_SERVICE%%share/examples/mico/services/trader/run
%%PORTDOCS%%share/examples/mico/shlib/Makefile
%%PORTDOCS%%share/examples/mico/shlib/client.cc
%%PORTDOCS%%share/examples/mico/shlib/hello

%%PORTDOCS%%@dirrm share/examples/mico/siegel/central
%%PORTDOCS%%@dirrm share/examples/mico/siegel
%%PORTDOCS%%@dirrm share/examples/mico/shlib
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/trader
%%PORTDOCS%%@dirrm share/examples/mico/services/stream-sound
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/stream-bench
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/relship
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/property-daemon
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/naming-lb
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/naming
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/lifecycle
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/services/events
%%PORTDOCS%%@dirrm share/examples/mico/services
%%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/security/tutorial
%%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/security/l2

%%PORTDOCS%%@dirrm share/examples/mico/mt/callback
%%PORTDOCS%%@dirrm share/examples/mico/mt
%%PORTDOCS%%@dirrm share/examples/mico/mcast
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/lifecycle
%%PORTDOCS%%@dirrm share/examples/mico/interop/visibroker
%%PORTDOCS%%@dirrm share/examples/mico/interop/orbix
%%PORTDOCS%%@dirrm share/examples/mico/interop/jdk

%%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/csiv2/hello-1
%%PORTDOCS%%%%MICO_SSL%%@dirrm share/examples/mico/csiv2
%%PORTDOCS%%@dirrm share/examples/mico/codesets
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm/philo
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm/hello2
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm/hello
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm/events
%%PORTDOCS%%%%MICO_SERVICE%%@dirrm share/examples/mico/ccm
%%PORTDOCS%%@dirrm share/examples/mico/boa/activate
%%PORTDOCS%%@dirrm share/examples/mico/boa/account4
%%PORTDOCS%%@dirrm share/examples/mico/boa/account3

Return to bug 54117

Line 0 Link Here

(-)mico/files/patch-fixes::externalization (+302 lines)
		1	--- coss/externalization/Makefile.orig Fri Feb 14 13:55:55 2003
		2	+++ coss/externalization/Makefile Fri Jul 4 15:01:11 2003
		3	@@ -85,6 +85,8 @@
		4	$(CXX) $(CXXFLAGS) $(LDFLAGS) extreferenced.o $(LDLIBS) -o extreferenced
		5	$(POSTLD) $@
		6
		7	+idlcompile: CosExternalization.cc CosExternalizationContainment.cc CosExternalizationReference.cc
		8	+
		9	CosExternalization.h CosExternalization.cc: \
		10	../../include/coss/CosExternalization.idl $(IDL)
		11	$(IDL) $(IDLFLAGS) --name CosExternalization \
		12	--- include/coss/CosStream_impl.h.orig Fri Jul 4 15:24:06 2003
		13	+++ include/coss/CosStream_impl.h Fri Jul 4 17:12:36 2003
		14	@@ -58,8 +58,8 @@
		15
		16	class StreamIO_impl : virtual public POA_CosStream::StreamIO
		17	{
		18	- istream* istream_;
		19	- ostream* ostream_;
		20	+ std::istream* istream_;
		21	+ std::ostream* ostream_;
		22	enum in_out
		23	{
		24	in,
		25	@@ -67,12 +67,12 @@
		26	} iotype;
		27
		28	protected:
		29	- CORBA::Boolean was_extern(vector<CosObjectIdentity::ObjectIdentifier>* vec_,
		30	+ CORBA::Boolean was_extern(std::vector<CosObjectIdentity::ObjectIdentifier>* vec_,
		31	CosObjectIdentity::ObjectIdentifier id);
		32	public:
		33	- StreamIO_impl(ostream* ostream_ptr = &cout)
		34	+ StreamIO_impl(std::ostream* ostream_ptr = &std::cout)
		35	: ostream_(ostream_ptr), iotype(out) { };
		36	- StreamIO_impl(istream* istream_ptr = &cin)
		37	+ StreamIO_impl(std::istream* istream_ptr = &std::cin)
		38	: istream_(istream_ptr), iotype(in) { };
		39
		40	virtual void write_string(const char* aString);
		41	--- include/coss/Externalization_impl.h.orig Fri Jul 4 18:04:44 2003
		42	+++ include/coss/Externalization_impl.h Fri Jul 4 18:08:33 2003
		43	@@ -32,8 +32,8 @@
		44	{
		45	CORBA::String_var filename_;
		46	CosLifeCycle::Key factory_id_;
		47	- istream* ifstream_;
		48	- ostream* ofstream_;
		49	+ std::istream* ifstream_;
		50	+ std::ostream* ofstream_;
		51	CORBA::Boolean context;
		52
		53	public:
		54	--- coss/externalization/Stream_impl.cc.orig Fri Jul 4 15:30:45 2003
		55	+++ coss/externalization/Stream_impl.cc Fri Jul 4 16:58:23 2003
		56	@@ -37,8 +37,10 @@
		57	#include <iostream.h>
		58	#endif
		59
		60	-typedef map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,less<RoleNameKey> > WorkedRoles;
		61	-typedef map<RoleNameKey,CosGraphs::Role_ptr,less<RoleNameKey> > NewRoles;
		62	+using std::string;
		63	+
		64	+typedef std::map<RoleNameKey,CosGraphs::Traversal::TraversalScopedId,std::less<RoleNameKey> > WorkedRoles;
65	+typedef std::map<RoleNameKey,CosGraphs::Role_ptr,std::less<RoleNameKey> > NewRoles;
66	typedef IfaceSequenceTmpl<CosCompoundExternalization::Node_var,CosCompoundExternalization::Node_ptr> NewNodes;
67
68	const char tag_object = 0xF0;
69	@@ -135,10 +137,10 @@
70	(*aStreamable).externalize_to_stream(_sio);
71	}
72
73	-CORBA::Boolean StreamIO_impl::was_extern(vector<CosObjectIdentity::ObjectIdentifier>* vec_,
74	+CORBA::Boolean StreamIO_impl::was_extern(std::vector<CosObjectIdentity::ObjectIdentifier>* vec_,
75	CosObjectIdentity::ObjectIdentifier id)
76	{
77	- vector<CosObjectIdentity::ObjectIdentifier>::iterator j;
78	+ std::vector<CosObjectIdentity::ObjectIdentifier>::iterator j;
79	for(j = vec_->begin();j != vec_->end();++j)
80	if (*j == id)
81	return TRUE;
82	@@ -151,10 +153,10 @@
83	if (iotype != out)
84	return;
85	CosStream::StreamIO_ptr _sio = this->_this();
86	- vector<CosObjectIdentity::ObjectIdentifier>* done_nodes =
87	- new vector<CosObjectIdentity::ObjectIdentifier>;
88	- vector<CosObjectIdentity::ObjectIdentifier>* done_rel =
89	- new vector<CosObjectIdentity::ObjectIdentifier>;
90	+ std::vector<CosObjectIdentity::ObjectIdentifier>* done_nodes =
91	+ new std::vector<CosObjectIdentity::ObjectIdentifier>;
92	+ std::vector<CosObjectIdentity::ObjectIdentifier>* done_rel =
93	+ new std::vector<CosObjectIdentity::ObjectIdentifier>;
94	// Externalize Root Node
95	CosObjectIdentity::ObjectIdentifier starting_node_id = starting_node->constant_random_id();
96	// End
97	--- coss/externalization/Externalization_impl.cc.orig Fri Jul 4 15:28:31 2003
98	+++ coss/externalization/Externalization_impl.cc Fri Jul 4 15:28:51 2003
99	@@ -37,6 +37,8 @@
100	#include <coss/CosStream_impl.h>
101	#include <coss/RegisterHelper.h>
102
103	+using std::string;
104	+
105	#ifndef _WIN32
106	Stream_impl::Stream_impl(const char* filename = NULL)
107	: POA_CosExternalization::Stream(),
108	--- coss/externalization/extreferenced.cc.orig Fri Jul 4 17:57:42 2003
109	+++ coss/externalization/extreferenced.cc Fri Jul 4 17:58:50 2003
110	@@ -34,8 +34,8 @@
111	static void
112	usage(const char* progName)
113	{
114	- cerr << "Usage:\n";
115	- cerr << progName << " [options]\n"
116	+ std::cerr << "Usage:\n";
117	+ std::cerr << progName << " [options]\n"
118	"\n"
119	"Options:\n"
120	"-h, --help Show this message.\n"
121	@@ -65,7 +65,7 @@
122	else if(strcmp(argv[i], "--version") == 0 \|\|
123	strcmp(argv[i], "-v") == 0)
124	{
125	- cerr << "Version of CosExternalizationReference Service Factories is " << MICO_VERSION << endl;
126	+ std::cerr << "Version of CosExternalizationReference Service Factories is " << MICO_VERSION << std::endl;
127	return 0;
128	}
129	else if(strcmp(argv[i], "--with-naming") == 0 \|\|
130	@@ -76,8 +76,8 @@
131	type = RegisterHelper::trading;
132	else
133	{
134	- cerr << progName << ": unknown option `"
135	- << argv[i] << "'\n" << endl;
136	+ std::cerr << progName << ": unknown option `"
137	+ << argv[i] << "'\n" << std::endl;
138	usage(progName);
139	return 1;
140	}
141	--- coss/externalization/streamd.cc.orig Fri Jul 4 17:57:59 2003
142	+++ coss/externalization/streamd.cc Fri Jul 4 17:59:41 2003
143	@@ -38,8 +38,8 @@
144	static void
145	usage(const char* progName)
146	{
147	- cerr << "Usage:\n";
148	- cerr << progName << " [options]\n"
149	+ std::cerr << "Usage:\n";
150	+ std::cerr << progName << " [options]\n"
151	"\n"
152	"Options:\n"
153	"-h, --help Show this message.\n"
154	@@ -67,7 +67,7 @@
155	else if(strcmp(argv[i], "--version") == 0 \|\|
156	strcmp(argv[i], "-v") == 0)
157	{
158	- cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << endl;
159	+ std::cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << std::endl;
160	return 0;
161	}
162	else if(strcmp(argv[i], "--trading") == 0 \|\|
163	@@ -77,8 +77,8 @@
164	}
165	else
166	{
167	- cerr << progName << ": unknown option `"
168	- << argv[i] << "'\n" << endl;
169	+ std::cerr << progName << ": unknown option `"
170	+ << argv[i] << "'\n" << std::endl;
171	usage(progName);
172	return 1;
173	}
174	@@ -111,20 +111,20 @@
175	tr_obj = orb -> resolve_initial_references("TradingService");
176	#ifdef HAVE_EXCEPTIONS
177	} catch(CORBA::ORB::InvalidName&) {
178	- cerr << "Can`t resolve Trading Service. Abort" << endl;
179	+ std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
180	exit(1);
181	}
182	#endif
183	if (CORBA::is_nil(tr_obj))
184	{
185	- cerr << "Can`t resolve Trading Service. Abort" << endl;
186	+ std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
187	exit(1);
188	}
189	CosTrading::Lookup_var trader_ = CosTrading::Lookup::_narrow (tr_obj);
190	CosTrading::Register_var reg = trader_->register_if();
191	if (CORBA::is_nil(reg))
192	{
193	- cerr << "Invalid Trading Service. Abort" << endl;
194	+ std::cerr << "Invalid Trading Service. Abort" << std::endl;
195	exit(1);
196	}
197	CORBA::Object_var obj = trader_->type_repos();
198	@@ -132,7 +132,7 @@
199	CosTradingRepos::ServiceTypeRepository::_narrow(obj);
200	if (CORBA::is_nil(repo))
201	{
202	- cerr << "Invalid Trading Service. Abort" << endl;
203	+ std::cerr << "Invalid Trading Service. Abort" << std::endl;
204	exit(1);
205	}
206
207	--- coss/externalization/extcriteriad.cc.orig Fri Jul 4 17:58:08 2003
208	+++ coss/externalization/extcriteriad.cc Fri Jul 4 18:00:00 2003
209	@@ -37,8 +37,8 @@
210	static void
211	usage(const char* progName)
212	{
213	- cerr << "Usage:\n";
214	- cerr << progName << " [options]\n"
215	+ std::cerr << "Usage:\n";
216	+ std::cerr << progName << " [options]\n"
217	"\n"
218	"Options:\n"
219	"-h, --help Show this message.\n"
220	@@ -63,13 +63,13 @@
221	else if(strcmp(argv[i], "--version") == 0 \|\|
222	strcmp(argv[i], "-v") == 0)
223	{
224	- cerr << "Version of CosCompoundExternalization::PropagationCriteriaFactory Service is " << MICO_VERSION << endl;
225	+ std::cerr << "Version of CosCompoundExternalization::PropagationCriteriaFactory Service is " << MICO_VERSION << std::endl;
226	return 0;
227	}
228	else
229	{
230	- cerr << progName << ": unknown option `"
231	- << argv[i] << "'\n" << endl;
232	+ std::cerr << progName << ": unknown option `"
233	+ << argv[i] << "'\n" << std::endl;
234	usage(progName);
235	return 1;
236	}
237	--- coss/externalization/extcontainmentd.cc.orig Fri Jul 4 18:01:09 2003
238	+++ coss/externalization/extcontainmentd.cc Fri Jul 4 18:01:40 2003
239	@@ -34,8 +34,8 @@
240	static void
241	usage(const char* progName)
242	{
243	- cerr << "Usage:\n";
244	- cerr << progName << " [options]\n"
245	+ std::cerr << "Usage:\n";
246	+ std::cerr << progName << " [options]\n"
247	"\n"
248	"Options:\n"
249	"-h, --help Show this message.\n"
250	@@ -64,7 +64,7 @@
251	else if(strcmp(argv[i], "--version") == 0 \|\|
252	strcmp(argv[i], "-v") == 0)
253	{
254	- cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << endl;
255	+ std::cerr << "Version of CosExternalizationContainment Service Factories is " << MICO_VERSION << std::endl;
256	return 0;
257	}
258	else if(strcmp(argv[i], "--with-naming") == 0 \|\|
259	@@ -75,8 +75,8 @@
260	type = RegisterHelper::trading;
261	else
262	{
263	- cerr << progName << ": unknown option `"
264	- << argv[i] << "'\n" << endl;
265	+ std::cerr << progName << ": unknown option `"
266	+ << argv[i] << "'\n" << std::endl;
267	usage(progName);
268	return 1;
269	}
270	--- coss/externalization/extnoded.cc.orig Fri Jul 4 17:35:15 2003
271	+++ coss/externalization/extnoded.cc Fri Jul 4 17:35:45 2003
272	@@ -34,8 +34,8 @@
273	static void
274	usage(const char* progName)
275	{
276	- cerr << "Usage:\n";
277	- cerr << progName << " [options]\n"
278	+ std::cerr << "Usage:\n";
279	+ std::cerr << progName << " [options]\n"
280	"\n"
281	"Options:\n"
282	"-h, --help Show this message.\n"
283	@@ -64,7 +64,7 @@
284	else if(strcmp(argv[i], "--version") == 0 \|\|
285	strcmp(argv[i], "-v") == 0)
286	{
287	- cerr << "Version of CosCompoundExternalization::Node Service Factories is " << MICO_VERSION << endl;
288	+ std::cerr << "Version of CosCompoundExternalization::Node Service Factories is " << MICO_VERSION << std::endl;
289	return 0;
290	}
291	else if(strcmp(argv[i], "--with-naming") == 0 \|\|
292	@@ -75,8 +75,8 @@
293	type = RegisterHelper::trading;
294	else
295	{
296	- cerr << progName << ": unknown option `"
297	- << argv[i] << "'\n" << endl;
298	+ std::cerr << progName << ": unknown option `"
299	+ << argv[i] << "'\n" << std::endl;
300	usage(progName);
301	return 1;
302	}

Line 0 Link Here

(-)mico/files/patch-fixes::lifecycle (+464 lines)
		1	--- coss/lifecycle/Makefile.orig Fri Feb 14 13:55:55 2003
		2	+++ coss/lifecycle/Makefile Fri Jul 4 12:33:15 2003
		3	@@ -101,6 +101,8 @@
		4	$(CXX) $(CXXFLAGS) $(LDFLAGS) genericfactory.o $(LDLIBS) -o genericfactory
		5	$(POSTLD) $@
		6
		7	+idlcompile: CosLifeCycle.cc CosCompoundLifeCycle.cc CosLifeCycleContainment.cc CosLifeCycleReference.cc
		8	+
		9	CosLifeCycle.h CosLifeCycle.cc: \
		10	../../include/coss/CosLifeCycle.idl $(IDL)
		11	$(IDL) $(IDLFLAGS) --name CosLifeCycle \
		12	--- coss/lifecycle/FactoryFinder_impl.cc.orig Fri Jul 4 14:44:09 2003
		13	+++ coss/lifecycle/FactoryFinder_impl.cc Fri Jul 4 16:44:03 2003
		14	@@ -28,6 +28,8 @@
		15	#include <coss/FactoryFinder_impl.h>
		16	#include <string>
		17
		18	+using std::string;
		19	+
		20	FactoryFinder_impl::FactoryFinder_impl()
		21	#ifndef _WIN32
		22	: POA_CosLifeCycle::FactoryFinder ()
		23	@@ -61,13 +63,13 @@
		24	nm_obj = orb -> resolve_initial_references("NameService");
		25	#ifdef HAVE_EXCEPTIONS
		26	} catch(CORBA::ORB::InvalidName&) {
		27	- cerr << "Can`t resolve Naming Service. Abort" << endl;
		28	+ std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
		29	exit(1);
		30	}
		31	#endif
		32	if (CORBA::is_nil(nm_obj))
		33	{
		34	- cerr << "Can`t resolve Naming Service. Abort" << endl;
		35	+ std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
		36	exit(1);
		37	}
		38	naming_ = CosNaming::NamingContext::_narrow (nm_obj);
		39	@@ -82,13 +84,13 @@
		40	tr_obj = orb -> resolve_initial_references("TradingService");
		41	#ifdef HAVE_EXCEPTIONS
		42	} catch(CORBA::ORB::InvalidName&) {
		43	- cerr << "Can`t resolve Trading Service. Abort" << endl;
		44	+ std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
		45	exit(1);
		46	}
		47	#endif
		48	if (CORBA::is_nil(tr_obj))
		49	{
		50	- cerr << "Can`t resolve Trading Service. Abort" << endl;
		51	+ std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
		52	exit(1);
		53	}
		54	trader_ = CosTrading::Lookup::_narrow (tr_obj);
		55	--- coss/lifecycle/GenericFactory_impl.cc.orig Fri Jul 4 14:47:28 2003
		56	+++ coss/lifecycle/GenericFactory_impl.cc Fri Jul 4 16:19:21 2003
		57	@@ -25,6 +25,7 @@
		58	#include <CORBA.h>
		59	#include <coss/GenericFactory_impl.h>
		60
		61	+using std::string;
		62
		63	GenericFactory_impl::GenericFactory_impl (void)
		64	#ifndef _WIN32
65	@@ -58,13 +59,13 @@
66	nm_obj = orb -> resolve_initial_references("NameService");
67	#ifdef HAVE_EXCEPTIONS
68	} catch(CORBA::ORB::InvalidName&) {
69	- cerr << "Can`t resolve Naming Service. Abort" << endl;
70	+ std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
71	exit(1);
72	}
73	#endif
74	if (CORBA::is_nil(nm_obj))
75	{
76	- cerr << "Can`t resolve Naming Service. Abort" << endl;
77	+ std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
78	exit(1);
79	}
80	naming_ = CosNaming::NamingContext::_narrow (nm_obj);
81	@@ -79,13 +80,13 @@
82	tr_obj = orb -> resolve_initial_references("TradingService");
83	#ifdef HAVE_EXCEPTIONS
84	} catch(CORBA::ORB::InvalidName&) {
85	- cerr << "Can`t resolve Trading Service. Abort" << endl;
86	+ std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
87	exit(1);
88	}
89	#endif
90	if (CORBA::is_nil(tr_obj))
91	{
92	- cerr << "Can`t resolve Trading Service. Abort" << endl;
93	+ std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
94	exit(1);
95	}
96	trader_ = CosTrading::Lookup::_narrow (tr_obj);
97	@@ -404,8 +405,8 @@
98	if (!strcmp(factory_key[3].id.in(),""))
99	return CORBA::Object::_nil();
100
101	- CORBA::String_var filter_ = (char *)NULL;
102	- CORBA::String_var preferences = (char *)NULL;
103	+ const char* filter_ = NULL;
104	+ const char* preferences = NULL;
105	CORBA::ULong i;
106	for(i = 0;i < the_criteria.length();++i)
107	if (!strcmp(the_criteria[i].name,"filter"))
108	@@ -505,13 +506,13 @@
109	add_ += filter;
110	filter = add_;
111	}
112	- if (filter.size() && filter_.in())
113	+ if (filter.size() && filter_ != NULL)
114	{
115	string add_;
116	add_ += "(";
117	add_ += filter;
118	add_ += ") and ";
119	- add_ += filter_.in();
120	+ add_ += filter_;
121	filter = add_;
122	}
123
124	--- coss/lifecycle/Operations_impl.cc.orig Fri Jul 4 16:41:53 2003
125	+++ coss/lifecycle/Operations_impl.cc Fri Jul 4 16:42:53 2003
126	@@ -30,9 +30,9 @@
127	#include <list>
128	#include <algorithm>
129
130	-typedef map<RoleKey,CosGraphs::Role_ptr,less<RoleKey> > WorkedRoles;
131	-typedef list<CosObjectIdentity::ObjectIdentifier> WorkedRelationships;
132	-typedef list<CosGraphs::Traversal::TraversalScopedId> WorkedNodes;
133	+typedef std::map<RoleKey,CosGraphs::Role_ptr,std::less<RoleKey> > WorkedRoles;
134	+typedef std::list<CosObjectIdentity::ObjectIdentifier> WorkedRelationships;
135	+typedef std::list<CosGraphs::Traversal::TraversalScopedId> WorkedNodes;
136
137	Operations_impl::Operations_impl()
138	#ifndef _WIN32
139	@@ -142,7 +142,7 @@
140	#endif
141	for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
142	{
143	- if (find(workedRelationships.begin(),
144	+ if (std::find(workedRelationships.begin(),
145	workedRelationships.end(),
146	(*OriginalEdgeList)[i].the_relationship.scoped_relationship.constant_random_id) !=
147	workedRelationships.end())
148	@@ -251,7 +251,7 @@
149	ex.reason = CORBA::string_dup("Node not supported CosCompoundLifeCycle::Node interface.");
150	mico_throw (ex);
151	}
152	- if (find(MovedNodes.begin(),MovedNodes.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
153	+ if (std::find(MovedNodes.begin(),MovedNodes.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
154	MovedNodes.end())
155	continue;
156	current_node_ptr->move_node(there,the_criteria);
157	@@ -290,7 +290,7 @@
158
159	for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
160	{
161	- if (find(Rel4Remove.begin(),Rel4Remove.end(),
162	+ if (std::find(Rel4Remove.begin(),Rel4Remove.end(),
163	(*OriginalEdgeList)[i].the_relationship.scoped_relationship.constant_random_id) !=
164	Rel4Remove.end())
165	continue;
166	@@ -316,7 +316,7 @@
167	#endif
168	for(CORBA::ULong i = 0;i < (*OriginalEdgeList).length();++i)
169	{
170	- if (find(Nodes4Remove.begin(),Nodes4Remove.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
171	+ if (std::find(Nodes4Remove.begin(),Nodes4Remove.end(),(*OriginalEdgeList)[i].from.point.the_node.constant_random_id) !=
172	Nodes4Remove.end())
173	continue;
174	CosCompoundLifeCycle::Node_ptr tmp_node_ptr =
175	--- coss/lifecycle/RegisterHelper.cc.orig Fri Jul 4 16:44:17 2003
176	+++ coss/lifecycle/RegisterHelper.cc Fri Jul 4 16:45:17 2003
177	@@ -45,7 +45,7 @@
178	#ifdef HAVE_EXCEPTIONS
179	} catch(CORBA::ORB::InvalidName&) {
180	#if DEBUG
181	- cerr << "Can`t resolve Naming Service." << endl;
182	+ std::cerr << "Can`t resolve Naming Service." << std::endl;
183	#endif
184	}
185	#endif
186	@@ -64,7 +64,7 @@
187	#ifdef HAVE_EXCEPTIONS
188	} catch(CORBA::ORB::InvalidName&) {
189	#if DEBUG
190	- cerr << "Can`t resolve Trading Service." << endl;
191	+ std::cerr << "Can`t resolve Trading Service." << std::endl;
192	#endif
193	}
194	#endif
195	@@ -121,14 +121,14 @@
196	{
197	if (CORBA::is_nil(_obj))
198	{
199	- cerr << "Can`t resolve Naming Service. Abort" << endl;
200	- return FALSE;
201	+ std::cerr << "Can`t resolve Naming Service. Abort" << std::endl;
202	+ return FALSE;
203	}
204	CosNaming::NamingContext_var nc = CosNaming::NamingContext::_narrow(_obj);
205	if (CORBA::is_nil(nc.in()))
206	{
207	- cerr << "Invalid Naming Service. Abort" << endl;
208	- return FALSE;
209	+ std::cerr << "Invalid Naming Service. Abort" << std::endl;
210	+ return FALSE;
211	}
212	CosNaming::Name full(4);
213	full.length(4);
214	@@ -173,14 +173,14 @@
215	{
216	if (CORBA::is_nil(_obj))
217	{
218	- cerr << "Can`t resolve Trading Service. Abort" << endl;
219	+ std::cerr << "Can`t resolve Trading Service. Abort" << std::endl;
220	return FALSE;
221	}
222	CosTrading::Lookup_var trader_ = CosTrading::Lookup::_narrow (_obj);
223	CosTrading::Register_var reg = trader_->register_if();
224	if (CORBA::is_nil(reg))
225	{
226	- cerr << "Invalid Trading Service. Abort" << endl;
227	+ std::cerr << "Invalid Trading Service. Abort" << std::endl;
228	return FALSE;
229	}
230	CORBA::Object_var obj = trader_->type_repos();
231	@@ -188,7 +188,7 @@
232	CosTradingRepos::ServiceTypeRepository::_narrow(obj);
233	if (CORBA::is_nil(repo))
234	{
235	- cerr << "Invalid Trading Service. Abort" << endl;
236	+ std::cerr << "Invalid Trading Service. Abort" << std::endl;
237	return FALSE;
238	}
239
240	--- coss/lifecycle/lifenoded.cc.orig Fri Jul 4 17:16:08 2003
241	+++ coss/lifecycle/lifenoded.cc Fri Jul 4 17:17:41 2003
242	@@ -36,8 +36,8 @@
243	static void
244	usage(const char* progName)
245	{
246	- cerr << "Usage:\n";
247	- cerr << progName << " [options]\n"
248	+ std::cerr << "Usage:\n";
249	+ std::cerr << progName << " [options]\n"
250	"\n"
251	"Options:\n"
252	"-h, --help Show this message.\n"
253	@@ -66,7 +66,7 @@
254	else if(strcmp(argv[i], "--version") == 0 \|\|
255	strcmp(argv[i], "-v") == 0)
256	{
257	- cerr << "Version of CosCompoundLifeCycle::Node Service Factories is " << MICO_VERSION << endl;
258	+ std::cerr << "Version of CosCompoundLifeCycle::Node Service Factories is " << MICO_VERSION << std::endl;
259	return 0;
260	}
261	else if(strcmp(argv[i], "--with-naming") == 0 \|\|
262	@@ -81,8 +81,8 @@
263	}
264	else
265	{
266	- cerr << progName << ": unknown option `"
267	- << argv[i] << "'\n" << endl;
268	+ std::cerr << progName << ": unknown option `"
269	+ << argv[i] << "'\n" << std::endl;
270	usage(progName);
271	return 1;
272	}
273	--- coss/lifecycle/lifecontainmentd.cc.orig Fri Jul 4 17:22:32 2003
274	+++ coss/lifecycle/lifecontainmentd.cc Fri Jul 4 17:23:15 2003
275	@@ -36,8 +36,8 @@
276	static void
277	usage(const char* progName)
278	{
279	- cerr << "Usage:\n";
280	- cerr << progName << " [options]\n"
281	+ std::cerr << "Usage:\n";
282	+ std::cerr << progName << " [options]\n"
283	"\n"
284	"Options:\n"
285	"-h, --help Show this message.\n"
286	@@ -65,7 +65,7 @@
287	else if(strcmp(argv[i], "--version") == 0 \|\|
288	strcmp(argv[i], "-v") == 0)
289	{
290	- cerr << "Version of CosLifeCycleContainment Service Factories is " << MICO_VERSION << endl;
291	+ std::cerr << "Version of CosLifeCycleContainment Service Factories is " << MICO_VERSION << std::endl;
292	return 0;
293	}
294	else if(strcmp(argv[i], "--with-naming") == 0 \|\|
295	@@ -80,8 +80,8 @@
296	}
297	else
298	{
299	- cerr << progName << ": unknown option `"
300	- << argv[i] << "'\n" << endl;
301	+ std::cerr << progName << ": unknown option `"
302	+ << argv[i] << "'\n" << std::endl;
303	usage(progName);
304	return 1;
305	}
306	--- coss/lifecycle/lifereferenced.cc.orig Fri Jul 4 17:24:49 2003
307	+++ coss/lifecycle/lifereferenced.cc Fri Jul 4 17:25:32 2003
308	@@ -36,8 +36,8 @@
309	static void
310	usage(const char* progName)
311	{
312	- cerr << "Usage:\n";
313	- cerr << progName << " [options]\n"
314	+ std::cerr << "Usage:\n";
315	+ std::cerr << progName << " [options]\n"
316	"\n"
317	"Options:\n"
318	"-h, --help Show this message.\n"
319	@@ -67,7 +67,7 @@
320	else if(strcmp(argv[i], "--version") == 0 \|\|
321	strcmp(argv[i], "-v") == 0)
322	{
323	- cerr << "Version of CosLifeCycleReference Service Factories is " << MICO_VERSION << endl;
324	+ std::cerr << "Version of CosLifeCycleReference Service Factories is " << MICO_VERSION << std::endl;
325	return 0;
326	}
327	else if(strcmp(argv[i], "--with-naming") == 0 \|\|
328	@@ -82,8 +82,8 @@
329	}
330	else
331	{
332	- cerr << progName << ": unknown option `"
333	- << argv[i] << "'\n" << endl;
334	+ std::cerr << progName << ": unknown option `"
335	+ << argv[i] << "'\n" << std::endl;
336	usage(progName);
337	return 1;
338	}
339	--- coss/lifecycle/operationd.cc.orig Fri Jul 4 17:26:48 2003
340	+++ coss/lifecycle/operationd.cc Fri Jul 4 17:27:22 2003
341	@@ -30,8 +30,8 @@
342	static void
343	usage(const char* progName)
344	{
345	- cerr << "Usage:\n";
346	- cerr << progName << " [options]\n"
347	+ std::cerr << "Usage:\n";
348	+ std::cerr << progName << " [options]\n"
349	"\n"
350	"Options:\n"
351	"-h, --help Show this message.\n"
352	@@ -56,13 +56,13 @@
353	else if(strcmp(argv[i], "--version") == 0 \|\|
354	strcmp(argv[i], "-v") == 0)
355	{
356	- cerr << "Version of CosCompoundLifeCycle::OperationsFactory Service is " << MICO_VERSION << endl;
357	+ std::cerr << "Version of CosCompoundLifeCycle::OperationsFactory Service is " << MICO_VERSION << std::endl;
358	return 0;
359	}
360	else
361	{
362	- cerr << progName << ": unknown option `"
363	- << argv[i] << "'\n" << endl;
364	+ std::cerr << progName << ": unknown option `"
365	+ << argv[i] << "'\n" << std::endl;
366	usage(progName);
367	return 1;
368	}
369	--- coss/lifecycle/lifecriteriad.cc.orig Fri Jul 4 17:29:24 2003
370	+++ coss/lifecycle/lifecriteriad.cc Fri Jul 4 17:29:58 2003
371	@@ -38,8 +38,8 @@
372	static void
373	usage(const char* progName)
374	{
375	- cerr << "Usage:\n";
376	- cerr << progName << " [options]\n"
377	+ std::cerr << "Usage:\n";
378	+ std::cerr << progName << " [options]\n"
379	"\n"
380	"Options:\n"
381	"-h, --help Show this message.\n"
382	@@ -64,13 +64,13 @@
383	else if(strcmp(argv[i], "--version") == 0 \|\|
384	strcmp(argv[i], "-v") == 0)
385	{
386	- cerr << "Version of CosCompoundLifeCycle::PropagationCriteriaFactory Service is " << MICO_VERSION << endl;
387	+ std::cerr << "Version of CosCompoundLifeCycle::PropagationCriteriaFactory Service is " << MICO_VERSION << std::endl;
388	return 0;
389	}
390	else
391	{
392	- cerr << progName << ": unknown option `"
393	- << argv[i] << "'\n" << endl;
394	+ std::cerr << progName << ": unknown option `"
395	+ << argv[i] << "'\n" << std::endl;
396	usage(progName);
397	return 1;
398	}
399	--- coss/lifecycle/factoryfinderd.cc.orig Fri Jul 4 17:31:06 2003
400	+++ coss/lifecycle/factoryfinderd.cc Fri Jul 4 17:31:36 2003
401	@@ -29,8 +29,8 @@
402	static void
403	usage(const char* progName)
404	{
405	- cerr << "Usage:\n";
406	- cerr << progName << " [options]\n"
407	+ std::cerr << "Usage:\n";
408	+ std::cerr << progName << " [options]\n"
409	"\n"
410	"Options:\n"
411	"-h, --help Show this message.\n"
412	@@ -58,7 +58,7 @@
413	else if(strcmp(argv[i], "--version") == 0 \|\|
414	strcmp(argv[i], "-v") == 0)
415	{
416	- cerr << "Version of CosLifeCycle::FactoryFinder Service is " << MICO_VERSION << endl;
417	+ std::cerr << "Version of CosLifeCycle::FactoryFinder Service is " << MICO_VERSION << std::endl;
418	return 0;
419	}
420	else if(strcmp(argv[i], "--with-naming") == 0 \|\|
421	@@ -69,8 +69,8 @@
422	type = RegisterHelper::trading;
423	else
424	{
425	- cerr << progName << ": unknown option `"
426	- << argv[i] << "'\n" << endl;
427	+ std::cerr << progName << ": unknown option `"
428	+ << argv[i] << "'\n" << std::endl;
429	usage(progName);
430	return 1;
431	}
432	--- coss/lifecycle/genericfactory.cc.orig Fri Jul 4 17:32:54 2003
433	+++ coss/lifecycle/genericfactory.cc Fri Jul 4 17:33:21 2003
434	@@ -29,8 +29,8 @@
435	static void
436	usage(const char* progName)
437	{
438	- cerr << "Usage:\n";
439	- cerr << progName << " [options]\n"
440	+ std::cerr << "Usage:\n";
441	+ std::cerr << progName << " [options]\n"
442	"\n"
443	"Options:\n"
444	"-h, --help Show this message.\n"
445	@@ -58,7 +58,7 @@
446	else if(strcmp(argv[i], "--version") == 0 \|\|
447	strcmp(argv[i], "-v") == 0)
448	{
449	- cerr << "Version of CosLifeCycle::GenericFactory Service is " << MICO_VERSION << endl;
450	+ std::cerr << "Version of CosLifeCycle::GenericFactory Service is " << MICO_VERSION << std::endl;
451	return 0;
452	}
453	else if(strcmp(argv[i], "--with-naming") == 0 \|\|
454	@@ -69,8 +69,8 @@
455	type = RegisterHelper::trading;
456	else
457	{
458	- cerr << progName << ": unknown option `"
459	- << argv[i] << "'\n" << endl;
460	+ std::cerr << progName << ": unknown option `"
461	+ << argv[i] << "'\n" << std::endl;
462	usage(progName);
463	return 1;
464	}