diff -Naur mico.orig/Makefile mico/Makefile --- mico.orig/Makefile Fri Feb 14 11:55:53 2003 +++ mico/Makefile Fri Feb 14 14:15:35 2003 @@ -72,7 +72,7 @@ $(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \ $(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \ fi - -ldconfig +# -ldconfig install-cd: for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done diff -Naur mico.orig/include/mico/os-math.h mico/include/mico/os-math.h --- mico.orig/include/mico/os-math.h 2003-05-26 12:55:46.000000000 +0200 +++ mico/include/mico/os-math.h 2003-07-01 12:00:36.000000000 +0200 @@ -279,11 +279,7 @@ #include #include #include - -#if !defined(__GNUG__) || !defined(__sgi) -// conflict for initstate () -#include -#endif +#include #ifdef HAVE_FLOAT_H #include @@ -343,6 +339,7 @@ static MICO_Boolean is_infinity (MICO_Double d) { + using namespace std; #if defined(HAVE_ISINF) return isinf (d); #elif defined(HAVE_FINITE) && defined(HAVE_ISNAN) @@ -354,6 +351,7 @@ static MICO_Boolean is_nan (MICO_Double d) { + using namespace std; #if defined(HAVE_ISNAN) return isnan (d); #else @@ -402,6 +400,7 @@ static MICO_Boolean is_infinityl (MICO_LongDouble d) { + using namespace std; #if defined(HAVE_ISINFL) return isinfl (d); #elif defined(HAVE_ISINF) @@ -413,6 +412,7 @@ static MICO_Boolean is_nanl (MICO_LongDouble d) { + using namespace std; #if defined(HAVE_ISNANL) return isnanl (d); #elif defined(HAVE_ISNAN) diff -Naur mico.orig/auxdir/tclmico.cc mico/auxdir/tclmico.cc --- mico.orig/auxdir/tclmico.cc Fri Dec 11 14:24:55 1998 +++ mico/auxdir/tclmico.cc Wed Jul 30 16:14:17 2003 @@ -46,9 +46,9 @@ TclDispatcher *disp = event->disp; CORBA::Long handle = event->handle; - set > seen; + std::set > seen; while (42) { - list::iterator i; + std::list::iterator i; for (i = disp->fevents.begin(); i != disp->fevents.end(); ++i) { if ((*i)->handle != handle) continue; @@ -80,7 +80,7 @@ TimerEvent *event = (TimerEvent *)_event; TclDispatcher *disp = event->disp; - list::iterator i; + std::list::iterator i; for (i = disp->tevents.begin(); i != disp->tevents.end(); ++i) { if ((*i) == event) { disp->tevents.erase(i); @@ -97,13 +97,13 @@ TclDispatcher::~TclDispatcher () { - list::iterator i; + std::list::iterator i; for (i = fevents.begin(); i != fevents.end(); ++i) { (*i)->cb->callback (this, Remove); delete *i; } - list::iterator j; + std::list::iterator j; for (j = tevents.begin(); j != tevents.end(); ++j) { (*j)->cb->callback (this, Remove); delete *j; @@ -123,7 +123,7 @@ ev = 0; int mask = 0; - list::iterator i; + std::list::iterator i; for (i = fevents.begin(); i != fevents.end(); ++i) { if ((*i)->handle != handle) continue; @@ -183,7 +183,7 @@ TclDispatcher::remove (CORBA::DispatcherCallback *cb, Event e) { if (e == All || e == Timer) { - list::iterator i, next; + std::list::iterator i, next; for (i = tevents.begin(); i != tevents.end(); i = next) { next = i; ++next; @@ -195,7 +195,7 @@ } } if (e == All || e == Read || e == Write || e == Except) { - list::iterator i, next; + std::list::iterator i, next; for (i = fevents.begin(); i != fevents.end(); i = next) { next = i; ++next; diff -Naur mico.orig/include/mico/tclmico.h mico/include/mico/tclmico.h --- mico.orig/include/mico/tclmico.h Mon May 26 12:55:46 2003 +++ mico/include/mico/tclmico.h Wed Jul 30 16:13:57 2003 @@ -57,8 +57,8 @@ : disp (_disp), token (_token), cb (_cb) {} }; - list fevents; - list tevents; + std::list fevents; + std::list tevents; static void input_callback (ClientData, int mask); static void timer_callback (ClientData);