head 1.15; access; symbols OPENPKG_E1_MP_HEAD:1.14 OPENPKG_E1_MP:1.14 OPENPKG_E1_MP_2_STABLE:1.14 OPENPKG_E1_FP:1.14 OPENPKG_2_STABLE_20061018:1.14 OPENPKG_2_STABLE:1.14.0.2 OPENPKG_2_STABLE_BP:1.14 OPENPKG_2_5_RELEASE:1.13 OPENPKG_2_5_SOLID:1.13.0.8 OPENPKG_2_5_SOLID_BP:1.13 OPENPKG_2_4_RELEASE:1.13 OPENPKG_2_4_SOLID:1.13.0.6 OPENPKG_2_4_SOLID_BP:1.13 OPENPKG_CW_FP:1.13 OPENPKG_2_3_RELEASE:1.13 OPENPKG_2_3_SOLID:1.13.0.4 OPENPKG_2_3_SOLID_BP:1.13 OPENPKG_2_2_RELEASE:1.13 OPENPKG_2_2_SOLID:1.13.0.2 OPENPKG_2_2_SOLID_BP:1.13 OPENPKG_2_0_RELEASE:1.10 OPENPKG_2_0_SOLID:1.10.0.2 OPENPKG_2_0_SOLID_BP:1.10 OPENPKG_1_3_RELEASE:1.1.2.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE_MP:1.8 OPENPKG_1_2_RELEASE:1.1 OPENPKG_1_2_SOLID:1.1.0.4 OPENPKG_1_2_SOLID_BP:1.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_BP:1.1; locks; strict; comment @# @; 1.15 date 2008.12.14.18.59.00; author rse; state Exp; branches; next 1.14; commitid ly5XSUwMkWQKZsut; 1.14 date 2006.02.07.18.55.23; author rse; state dead; branches; next 1.13; commitid GgR6kvNaqnh8rGkr; 1.13 date 2004.05.26.11.21.19; author ms; state Exp; branches; next 1.12; 1.12 date 2004.05.25.10.53.44; author ms; state Exp; branches; next 1.11; 1.11 date 2004.05.25.10.44.40; author ms; state Exp; branches; next 1.10; 1.10 date 2003.10.13.18.39.36; author rse; state Exp; branches; next 1.9; 1.9 date 2003.07.30.15.03.18; author ms; state Exp; branches; next 1.8; 1.8 date 2003.07.02.10.17.07; author ms; state Exp; branches; next 1.7; 1.7 date 2003.06.30.11.53.46; author mlelstv; state Exp; branches; next 1.6; 1.6 date 2003.06.27.13.02.33; author mlelstv; state Exp; branches; next 1.5; 1.5 date 2003.06.13.20.56.20; author mlelstv; state Exp; branches; next 1.4; 1.4 date 2003.05.27.14.11.15; author thl; state Exp; branches; next 1.3; 1.3 date 2003.02.24.13.01.17; author ms; state Exp; branches; next 1.2; 1.2 date 2003.02.14.13.18.47; author ms; state Exp; branches; next 1.1; 1.1 date 2002.12.30.19.14.41; author rse; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2003.07.24.20.50.07; author rse; state Exp; branches 1.1.2.1.2.1; next 1.1.2.2; 1.1.2.2 date 2003.08.01.06.46.15; author rse; state Exp; branches; next ; 1.1.2.1.2.1 date 2003.08.01.06.47.36; author rse; state Exp; branches; next ; desc @@ 1.15 log @upgrading package: mico 2.3.12 -> 2.3.13 @ text @Index: Makefile --- Makefile.orig 2008-07-25 15:41:44 +0200 +++ Makefile 2008-12-14 19:25:10 +0100 @@@@ -79,7 +79,6 @@@@ $(IDIRCMD) $(SHARED_INSTDIR)/doc/mico; \ $(IMANCMD) doc/doc.ps $(SHARED_INSTDIR)/doc/mico/manual.ps; \ fi - $(LDCONFIG) install-cd: for i in $(INSTALLDIRS); do $(MAKE) -C $$i install-cd || exit 1; done @ 1.14 log @upgrading package: mico 2.3.11 -> 2.3.12 @ text @a0 115 Index: auxdir/tclmico.cc --- auxdir/tclmico.cc.orig 2003-10-13 11:49:22.000000000 +0200 +++ auxdir/tclmico.cc 2003-10-13 20:02:21.000000000 +0200 @@@@ -48,9 +48,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; @@@@ -82,7 +82,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); @@@@ -99,13 +99,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; @@@@ -125,7 +125,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; @@@@ -185,7 +185,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; @@@@ -197,7 +197,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; Index: include/mico/os-math.h --- include/mico/os-math.h.orig 2003-10-13 11:49:32.000000000 +0200 +++ include/mico/os-math.h 2003-10-13 20:02:21.000000000 +0200 @@@@ -296,11 +296,7 @@@@ #include #include #include - -#if !defined(__GNUG__) || !defined(__sgi) -// conflict for initstate () -#include -#endif +#include #ifdef HAVE_FLOAT_H #include @@@@ -360,6 +356,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) @@@@ -371,6 +368,7 @@@@ static MICO_Boolean is_nan (MICO_Double d) { + using namespace std; #if defined(HAVE_ISNAN) return isnan (d); #else @@@@ -419,6 +417,7 @@@@ static MICO_Boolean is_infinityl (MICO_LongDouble d) { + using namespace std; #if defined(HAVE_ISINFL) return isinfl (d); #elif defined(HAVE_ISINF) @@@@ -430,6 +429,7 @@@@ static MICO_Boolean is_nanl (MICO_LongDouble d) { + using namespace std; #if defined(HAVE_ISNANL) return isnanl (d); #elif defined(HAVE_ISNAN) d2 3 a4 3 --- Makefile.orig 2003-10-13 11:49:22.000000000 +0200 +++ Makefile 2003-10-13 20:02:21.000000000 +0200 @@@@ -73,7 +73,7 @@@@ d8 1 a8 2 - -ldconfig +# -ldconfig a11 2020 Index: configure.in --- configure.in.orig 2004-05-26 13:15:46.000000000 +0200 +++ configure.in 2004-05-26 13:16:36.000000000 +0200 @@@@ -1233,10 +1233,23 @@@@ AC_FUNC_VPRINTF AC_LANG_CPLUSPLUS AC_CHECK_FUNCS(strdup strerror gethostname infnan isnan isinf finite) -AC_CHECK_FUNCS(infnanl isnanl isinfl asinl ldexpl frexpl fabsl floorl ceill) +AC_CHECK_FUNCS(infnanl isnanl isinfl ldexpl frexpl fabsl floorl ceill) AC_CHECK_FUNCS(powl fmodl dlopen shl_load ftime) AC_CHECK_FUNCS(backtrace backtrace_symbols) +# Warning, the following is for documentation purposes only and does not +# generate code compatible with that of the pristine MICO distribution. +# +# - MSvB (26 May 2004) +# +# Check for asinl, but do more than search for a symbol in standard library +AC_LANG_PUSH(C++) +AC_MSG_CHECKING(for asinl) +AC_COMPILE_IFELSE([AC_LANG_PROGRAM(#include , asinl(2.0);)], + [AC_DEFINE(HAVE_ASINL) AC_MSG_RESULT(yes)], + [AC_MSG_RESULT(no)]) +AC_LANG_POP(C++) + # # size of datatypes # Index: configure --- configure.orig 2003-10-13 11:49:22.000000000 +0200 +++ configure 2004-05-24 20:54:37.456564640 +0200 @@@@ -1424,7 +1424,7 @@@@ cat > conftest.$ac_ext << EOF -#line 1428 "configure" +#line 1427 "configure" #include "confdefs.h" main(){return(0);} @@@@ -1535,7 +1535,7 @@@@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error @@@@ -1552,7 +1552,7 @@@@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error @@@@ -1569,7 +1569,7 @@@@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error @@@@ -1648,7 +1648,7 @@@@ cat > conftest.$ac_ext << EOF -#line 1652 "configure" +#line 1651 "configure" #include "confdefs.h" int main(){return(0);} @@@@ -1757,7 +1757,7 @@@@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF @@@@ -1891,7 +1891,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lpthread $LIBS" cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -1978,7 +1978,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -2026,7 +2026,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -2113,7 +2113,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -2172,7 +2172,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -2276,7 +2276,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lcma $LIBS" cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -2418,7 +2418,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -2453,7 +2453,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lpth "-L$PTH_LIB_DIR" $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -2604,7 +2604,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -2650,7 +2650,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -2737,7 +2737,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -2783,7 +2783,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lthread $LIBS" cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -2876,7 +2876,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lcma $LIBS" cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -3006,7 +3006,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -3041,7 +3041,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lpth "-L$PTH_LIB_DIR" $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < EOF @@@@ -3743,7 +3743,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-l$ac_lib $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < @@@@ -4265,7 +4265,7 @@@@ CXXFLAGS="$CXXFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@@@ -4364,7 +4364,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < EOF @@@@ -4602,7 +4602,7 @@@@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < #include @@@@ -6198,7 +6198,7 @@@@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@@@ -6216,7 +6216,7 @@@@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@@@ -6237,7 +6237,7 @@@@ : else cat > conftest.$ac_ext < @@@@ -6283,7 +6283,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -6323,7 +6323,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -6363,7 +6363,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -6404,7 +6404,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -6446,7 +6446,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -6488,7 +6488,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -6531,7 +6531,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@@@ -6583,7 +6583,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@@@ -6618,7 +6618,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@@@ -6642,7 +6642,7 @@@@ CXXFLAGS="-Werror $CXXFLAGS" fi cat > conftest.$ac_ext < @@@@ -6703,7 +6703,7 @@@@ CXXFLAGS="-Werror $CXXFLAGS" fi cat > conftest.$ac_ext < @@@@ -6749,7 +6749,7 @@@@ CXXFLAGS="-Werror $CXXFLAGS" fi cat > conftest.$ac_ext < @@@@ -6799,7 +6799,7 @@@@ CXXFLAGS="-Werror $CXXFLAGS" fi cat > conftest.$ac_ext < @@@@ -6839,7 +6839,7 @@@@ LFSCANF=cross else cat > conftest.$ac_ext < @@@@ -6896,7 +6896,7 @@@@ LFPRINTF=cross else cat > conftest.$ac_ext < @@@@ -6964,7 +6964,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext <&6 echo "configure:7135: checking for $ac_func" >&5 @@@@ -7136,7 +7136,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 echo "configure:7193: checking for $ac_func" >&5 @@@@ -7194,7 +7194,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 else cat > conftest.$ac_ext <&6 +echo "configure:7316: checking for asinl" >&5 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +asinl(2.0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "configure:7334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "configure:7340: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "configure:7344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7347: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "configure:7350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_ASINL 1 +_ACEOF + echo "configure:7358: result: yes" >&5 +echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "configure:7364: result: no" >&5 +echo "$ac_t""no" 1>&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +# +# Check for ldexpl, but do more than search for a symbol in standard library +# +echo $ac_n "checking for ldexpl... $ac_c" 1>&6 +echo "configure:7316: checking for ldexpl" >&5 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +ldexpl(1, 2); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "configure:7334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "configure:7340: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "configure:7344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7347: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "configure:7350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_LDEXPL 1 +_ACEOF + echo "configure:7358: result: yes" >&5 +echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "configure:7364: result: no" >&5 +echo "$ac_t""no" 1>&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +# +# Check for frexpl, but do more than search for a symbol in standard library +# +echo $ac_n "checking for frexpl... $ac_c" 1>&6 +echo "configure:7316: checking for frexpl" >&5 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +frexpl(1.6, 0); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "configure:7334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "configure:7340: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "configure:7344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7347: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "configure:7350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_FREXPL 1 +_ACEOF + echo "configure:7358: result: yes" >&5 +echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "configure:7364: result: no" >&5 +echo "$ac_t""no" 1>&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +# +# Check for floorl, but do more than search for a symbol in standard library +# +echo $ac_n "checking for floorl... $ac_c" 1>&6 +echo "configure:7316: checking for floorl" >&5 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +floorl(1.6); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "configure:7334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "configure:7340: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "configure:7344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7347: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "configure:7350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_FLOORL 1 +_ACEOF + echo "configure:7358: result: yes" >&5 +echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "configure:7364: result: no" >&5 +echo "$ac_t""no" 1>&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +# +# Check for ceill, but do more than search for a symbol in standard library +# +echo $ac_n "checking for ceill... $ac_c" 1>&6 +echo "configure:7316: checking for ceill" >&5 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +ceill(1.6); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "configure:7334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "configure:7340: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "configure:7344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7347: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "configure:7350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_CEILL 1 +_ACEOF + echo "configure:7358: result: yes" >&5 +echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "configure:7364: result: no" >&5 +echo "$ac_t""no" 1>&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + + +# +# Check for fmodl, but do more than search for a symbol in standard library +# +echo $ac_n "checking for fmodl... $ac_c" 1>&6 +echo "configure:7316: checking for fmodl" >&5 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +int +main () +{ +fmodl(1.6, 2.2); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "configure:7334: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "configure:7340: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "configure:7344: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7347: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "configure:7350: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "configure:7353: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cat >>confdefs.h <<\_ACEOF +#define HAVE_FMODL 1 +_ACEOF + echo "configure:7358: result: yes" >&5 +echo "$ac_t""yes" 1>&6 +else + echo "configure: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "configure:7364: result: no" >&5 +echo "$ac_t""no" 1>&6 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + +# # size of datatypes # @@@@ -7672,7 +7672,7 @@@@ ac_cv_sizeof_unsigned_char=1 else cat > conftest.$ac_ext < @@@@ -7715,7 +7715,7 @@@@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < @@@@ -7758,7 +7758,7 @@@@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < @@@@ -7801,7 +7801,7 @@@@ ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < @@@@ -7844,7 +7844,7 @@@@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < @@@@ -7887,7 +7887,7 @@@@ ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < @@@@ -7930,7 +7930,7 @@@@ ac_cv_sizeof_unsigned_long_long=8 else cat > conftest.$ac_ext < @@@@ -7973,7 +7973,7 @@@@ ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < @@@@ -8016,7 +8016,7 @@@@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < @@@@ -8059,7 +8059,7 @@@@ ac_cv_sizeof_float=4 else cat > conftest.$ac_ext < @@@@ -8102,7 +8102,7 @@@@ ac_cv_sizeof_double=8 else cat > conftest.$ac_ext < @@@@ -8145,7 +8145,7 @@@@ ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext < @@@@ -8190,7 +8190,7 @@@@ ac_cv_sizeof_unsigned_char=1 else cat > conftest.$ac_ext < @@@@ -8233,7 +8233,7 @@@@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < @@@@ -8276,7 +8276,7 @@@@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < @@@@ -8319,7 +8319,7 @@@@ ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < @@@@ -8362,7 +8362,7 @@@@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < @@@@ -8405,7 +8405,7 @@@@ ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < @@@@ -8448,7 +8448,7 @@@@ ac_cv_sizeof_unsigned_long_long=8 else cat > conftest.$ac_ext < @@@@ -8491,7 +8491,7 @@@@ ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < @@@@ -8534,7 +8534,7 @@@@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < @@@@ -8577,7 +8577,7 @@@@ ac_cv_sizeof_float=4 else cat > conftest.$ac_ext < @@@@ -8620,7 +8620,7 @@@@ ac_cv_sizeof_double=8 else cat > conftest.$ac_ext < @@@@ -8663,7 +8663,7 @@@@ ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext < @@@@ -8708,7 +8708,7 @@@@ ac_cv_sizeof_unsigned_char=1 else cat > conftest.$ac_ext < @@@@ -8751,7 +8751,7 @@@@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < @@@@ -8794,7 +8794,7 @@@@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < @@@@ -8837,7 +8837,7 @@@@ ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < @@@@ -8880,7 +8880,7 @@@@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < @@@@ -8923,7 +8923,7 @@@@ ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < @@@@ -8966,7 +8966,7 @@@@ ac_cv_sizeof_unsigned_long_long=8 else cat > conftest.$ac_ext < @@@@ -9009,7 +9009,7 @@@@ ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < @@@@ -9052,7 +9052,7 @@@@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < @@@@ -9095,7 +9095,7 @@@@ ac_cv_sizeof_float=4 else cat > conftest.$ac_ext < @@@@ -9138,7 +9138,7 @@@@ ac_cv_sizeof_double=8 else cat > conftest.$ac_ext < @@@@ -9181,7 +9181,7 @@@@ ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext < @@@@ -9226,7 +9226,7 @@@@ ac_cv_sizeof_unsigned_char=1 else cat > conftest.$ac_ext < @@@@ -9269,7 +9269,7 @@@@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < @@@@ -9312,7 +9312,7 @@@@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < @@@@ -9355,7 +9355,7 @@@@ ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < @@@@ -9398,7 +9398,7 @@@@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < @@@@ -9441,7 +9441,7 @@@@ ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < @@@@ -9484,7 +9484,7 @@@@ ac_cv_sizeof_unsigned_long_long=8 else cat > conftest.$ac_ext < @@@@ -9527,7 +9527,7 @@@@ ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < @@@@ -9570,7 +9570,7 @@@@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < @@@@ -9613,7 +9613,7 @@@@ ac_cv_sizeof_float=4 else cat > conftest.$ac_ext < @@@@ -9656,7 +9656,7 @@@@ ac_cv_sizeof_double=8 else cat > conftest.$ac_ext < @@@@ -9699,7 +9699,7 @@@@ ac_cv_sizeof_long_double=8 else cat > conftest.$ac_ext < @@@@ -9754,7 +9754,7 @@@@ ac_cv_sizeof_unsigned_char=1 else cat > conftest.$ac_ext < @@@@ -9797,7 +9797,7 @@@@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < @@@@ -9840,7 +9840,7 @@@@ ac_cv_sizeof_unsigned_int=4 else cat > conftest.$ac_ext < @@@@ -9883,7 +9883,7 @@@@ ac_cv_sizeof_long=4 else cat > conftest.$ac_ext < @@@@ -9926,7 +9926,7 @@@@ ac_cv_sizeof_unsigned_long=4 else cat > conftest.$ac_ext < @@@@ -9969,7 +9969,7 @@@@ ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < @@@@ -10012,7 +10012,7 @@@@ ac_cv_sizeof_unsigned_long_long=8 else cat > conftest.$ac_ext < @@@@ -10055,7 +10055,7 @@@@ ac_cv_sizeof_short=2 else cat > conftest.$ac_ext < @@@@ -10098,7 +10098,7 @@@@ ac_cv_sizeof_unsigned_short=2 else cat > conftest.$ac_ext < @@@@ -10141,7 +10141,7 @@@@ ac_cv_sizeof_float=4 else cat > conftest.$ac_ext < @@@@ -10184,7 +10184,7 @@@@ ac_cv_sizeof_double=8 else cat > conftest.$ac_ext < @@@@ -10227,7 +10227,7 @@@@ ac_cv_sizeof_long_double=12 else cat > conftest.$ac_ext < @@@@ -10275,7 +10275,7 @@@@ ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext < #include @@@@ -10290,7 +10290,7 @@@@ rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext < #include @@@@ -10321,7 +10321,7 @@@@ { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < @@@@ -10393,7 +10393,7 @@@@ IEEEFP=cross else cat > conftest.$ac_ext < @@@@ -10461,7 +10461,7 @@@@ echo "configure:10109: checking for gethostname prototype" >&5 gethostname_pt=no cat > conftest.$ac_ext < EOF @@@@ -10473,7 +10473,7 @@@@ rm -f conftest* cat > conftest.$ac_ext < EOF @@@@ -10485,7 +10485,7 @@@@ rm -f conftest* cat > conftest.$ac_ext < EOF @@@@ -10509,7 +10509,7 @@@@ echo "configure:10157: checking for finite prototype" >&5 finite_pt=no cat > conftest.$ac_ext < EOF @@@@ -10533,7 +10533,7 @@@@ echo "configure:10181: checking for strerror prototype" >&5 strerror_pt=no cat > conftest.$ac_ext < EOF @@@@ -10558,7 +10558,7 @@@@ ftime_pt=no # solaris 2.5.1 mentions `ftime' it the header but doesnt have a prototype ... cat > conftest.$ac_ext < EOF @@@@ -10589,7 +10589,7 @@@@ echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <&6 else cat > conftest.$ac_ext < conftest.$ac_ext < @@@@ -11229,7 +11229,7 @@@@ STDEH=cross else cat > conftest.$ac_ext < @@@@ -11419,7 +11419,7 @@@@ SHRUN=cross-compiling else cat > conftest.$ac_ext < @@@@ -11489,7 +11489,7 @@@@ SHEXRUN=cross-compiling else cat > conftest.$ac_ext < @@@@ -11576,7 +11576,7 @@@@ DLRUN=cross-compiling else cat > conftest.$ac_ext < @@@@ -11638,7 +11638,7 @@@@ DLRUN=cross-compiling else cat > conftest.$ac_ext < @ 1.13 log @document recent configure patch for unusable stub cmath functions @ text @@ 1.12 log @whoops frexpl(3) takes a int* not a int second parameter @ text @d128 28 @ 1.11 log @port to correctly build on recent GCC releases, which either fail to include standard C++ library headers for asinl(3), ldexpl(3), frexpl(3), floorl(3), ceill(3), or fmodl(3), or which break with long standing (but false) behaviour of cmath library methods @ text @d1133 1 a1133 1 +frexpl(1.6, 2); @ 1.10 log @upgrading package: mico 2.3.10 -> 2.3.11 @ text @d128 1992 @ 1.9 log @Fix option handling and dependencies, add patchcode to correct missing namespaces in TCL library code @ text @d1 4 a4 64 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 @@@@ d16 1 a16 1 @@@@ -80,7 +80,7 @@@@ d25 1 a25 1 @@@@ -97,13 +97,13 @@@@ d41 1 a41 1 @@@@ -123,7 +123,7 @@@@ d50 1 a50 1 @@@@ -183,7 +183,7 @@@@ d59 1 a59 1 @@@@ -195,7 +195,7 @@@@ d68 17 a84 11 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; d86 42 a127 2 static void input_callback (ClientData, int mask); static void timer_callback (ClientData); @ 1.8 log @Minimize patch changes, and replace global std namespace declaration with four local ones @ text @d61 81 @ 1.7 log @use a more standard-like patch @ text @d13 5 a17 3 --- mico.orig/include/mico/os-math.h 2003-06-13 16:07:15.000000000 +0200 +++ mico/include/mico/os-math.h 2003-06-13 16:07:16.000000000 +0200 @@@@ -280,10 +280,8 @@@@ d20 1 a20 1 a25 1 +using namespace std; d29 32 @ 1.6 log @add declarations missing from freebsd5, prevent build from picking up java @ text @d15 1 a15 1 @@@@ -280,10 +280,15 @@@@ d21 1 a21 9 +extern "C" { +#if defined(HAVE_ISINF) +int isinf(double); +#endif +#if defined(HAVE_ISNAN) +int isnan(double); +#endif +} #include d23 2 @ 1.5 log @fix building with gcc3.3 @ text @d15 1 a15 1 @@@@ -280,10 +280,7 @@@@ d21 8 @ 1.4 log @upgrading package: mico 2.3.9 -> 2.3.10 @ text @d13 13 @ 1.3 log @Fix POA servant manager @ text @a12 14 diff -Naur mico.orig/orb/poa_impl.cc mico/orb/poa_impl.cc --- mico.orig/orb/poa_impl.cc.orig Sat Feb 22 23:20:22 2003 +++ mico/orb/poa_impl.cc Sat Feb 22 23:20:55 2003 @@@@ -3768,7 +3768,9 @@@@ // we are finished //this make sure nobody is going to remove the object - orec->invoke_cnt++; + if (servant_retention_policy->value() == PortableServer::RETAIN) { + orec->invoke_cnt++; + } } // end autolock /* @ 1.2 log @upgrading package: mico 2.3.8 -> 2.3.9 @ text @d13 14 @ 1.1 log @new package: mico 2.3.7 (CORBA Toolkit) @ text @d2 3 a4 3 --- mico.orig/Makefile Sun Mar 3 21:44:27 2002 +++ mico/Makefile Tue Dec 24 00:58:41 2002 @@@@ -62,7 +62,7 @@@@ @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @d2 3 a4 3 --- mico.orig/Makefile Fri Feb 14 11:55:53 2003 +++ mico/Makefile Fri Feb 14 14:15:35 2003 @@@@ -72,7 +72,7 @@@@ a12 48 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) @ 1.1.2.1.2.1 log @MFS: Qt/Gtk/Tcl fixes @ text @a60 81 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); @ 1.1.2.2 log @MFC: Qt/Gtk/Tcl fixes @ text @a60 81 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); @