Changeset 2088


Ignore:
Timestamp:
Jan 17, 2015 12:00:27 PM (5 years ago)
Author:
tkr
Message:

Missing flcose call caused unit test to fail

Location:
trunk/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r2036 r2088  
    19891989
    19901990
    1991  case $build in
    1992   *-mingw*)
    1993     if test "${LD+set}" = set; then :; else
    1994       LD=link
    1995     fi
    1996     ;;
    1997  esac
    1998  if test $enable_msvc = yes ; then
    1999    if test "x${LD+set}" = xset; then :; else
    2000      LD=link
    2001    fi
    2002  fi
    2003 
    2004 
    2005 
    20061991
    20071992ac_ext=c
     
    21072092             fi
    21082093             ;;
     2094  *-*-darwin*) comps="clang gcc cc" ;;
    21092095  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    21102096  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
     
    32243210  clang* ) ;;
    32253211  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3226 
    3227  case $build in
    3228   *-mingw*)
    3229     if test "${LD+set}" = set; then :; else
    3230       LD=link
    3231     fi
    3232     ;;
    3233  esac
    3234  if test $enable_msvc = yes ; then
    3235    if test "x${LD+set}" = xset; then :; else
    3236      LD=link
    3237    fi
    3238  fi
    3239 
     3212    LD=link
    32403213    ;;
    32413214esac
     
    32763249  *-*-solaris*)
    32773250             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3278   *-darwin*) comps="g++ c++ CC" ;;
     3251  *-darwin*) comps="clang++ g++ c++ CC" ;;
    32793252  *-linux-gnu*)
    32803253             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
     
    37133686# It seems that we need to cleanup something here for the Windows
    37143687case "$CXX" in
    3715   clang* ) ;;
     3688  clang* | */clang*) ;;
    37163689  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    37173690    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     
    41134086fi
    41144087
    4115 # correct the LD variable in a mingw build with MS or intel compiler
     4088# correct the LD variable in a build with MS or intel compiler
    41164089case "$CXX" in
    41174090  clang* ) ;;
    41184091  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    4119 
    4120  case $build in
    4121   *-mingw*)
    4122     if test "${LD+set}" = set; then :; else
    4123       LD=link
    4124     fi
    4125     ;;
    4126  esac
    4127  if test $enable_msvc = yes ; then
    4128    if test "x${LD+set}" = xset; then :; else
    4129      LD=link
    4130    fi
    4131  fi
    4132 
     4092    LD=link
    41334093    ;;
    41344094esac
     
    59105870*-*-irix6*)
    59115871  # Find out which ABI we are using.
    5912   echo '#line 5912 "configure"' > conftest.$ac_ext
     5872  echo '#line 5872 "configure"' > conftest.$ac_ext
    59135873  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59145874  (eval $ac_compile) 2>&5
     
    70447004
    70457005# Provide some information about the compiler.
    7046 echo "$as_me:7046:" \
     7006echo "$as_me:7006:" \
    70477007     "checking for Fortran 77 compiler version" >&5
    70487008ac_compiler=`set X $ac_compile; echo $2`
     
    81118071   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81128072   -e 's:$: $lt_compiler_flag:'`
    8113    (eval echo "\"\$as_me:8113: $lt_compile\"" >&5)
     8073   (eval echo "\"\$as_me:8073: $lt_compile\"" >&5)
    81148074   (eval "$lt_compile" 2>conftest.err)
    81158075   ac_status=$?
    81168076   cat conftest.err >&5
    8117    echo "$as_me:8117: \$? = $ac_status" >&5
     8077   echo "$as_me:8077: \$? = $ac_status" >&5
    81188078   if (exit $ac_status) && test -s "$ac_outfile"; then
    81198079     # The compiler can only warn and ignore the option if not recognized
     
    83798339   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83808340   -e 's:$: $lt_compiler_flag:'`
    8381    (eval echo "\"\$as_me:8381: $lt_compile\"" >&5)
     8341   (eval echo "\"\$as_me:8341: $lt_compile\"" >&5)
    83828342   (eval "$lt_compile" 2>conftest.err)
    83838343   ac_status=$?
    83848344   cat conftest.err >&5
    8385    echo "$as_me:8385: \$? = $ac_status" >&5
     8345   echo "$as_me:8345: \$? = $ac_status" >&5
    83868346   if (exit $ac_status) && test -s "$ac_outfile"; then
    83878347     # The compiler can only warn and ignore the option if not recognized
     
    84838443   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84848444   -e 's:$: $lt_compiler_flag:'`
    8485    (eval echo "\"\$as_me:8485: $lt_compile\"" >&5)
     8445   (eval echo "\"\$as_me:8445: $lt_compile\"" >&5)
    84868446   (eval "$lt_compile" 2>out/conftest.err)
    84878447   ac_status=$?
    84888448   cat out/conftest.err >&5
    8489    echo "$as_me:8489: \$? = $ac_status" >&5
     8449   echo "$as_me:8449: \$? = $ac_status" >&5
    84908450   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84918451   then
     
    1082810788  lt_status=$lt_dlunknown
    1082910789  cat > conftest.$ac_ext <<EOF
    10830 #line 10830 "configure"
     10790#line 10790 "configure"
    1083110791#include "confdefs.h"
    1083210792
     
    1092810888  lt_status=$lt_dlunknown
    1092910889  cat > conftest.$ac_ext <<EOF
    10930 #line 10930 "configure"
     10890#line 10890 "configure"
    1093110891#include "confdefs.h"
    1093210892
     
    1327213232   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1327313233   -e 's:$: $lt_compiler_flag:'`
    13274    (eval echo "\"\$as_me:13274: $lt_compile\"" >&5)
     13234   (eval echo "\"\$as_me:13234: $lt_compile\"" >&5)
    1327513235   (eval "$lt_compile" 2>conftest.err)
    1327613236   ac_status=$?
    1327713237   cat conftest.err >&5
    13278    echo "$as_me:13278: \$? = $ac_status" >&5
     13238   echo "$as_me:13238: \$? = $ac_status" >&5
    1327913239   if (exit $ac_status) && test -s "$ac_outfile"; then
    1328013240     # The compiler can only warn and ignore the option if not recognized
     
    1337613336   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1337713337   -e 's:$: $lt_compiler_flag:'`
    13378    (eval echo "\"\$as_me:13378: $lt_compile\"" >&5)
     13338   (eval echo "\"\$as_me:13338: $lt_compile\"" >&5)
    1337913339   (eval "$lt_compile" 2>out/conftest.err)
    1338013340   ac_status=$?
    1338113341   cat out/conftest.err >&5
    13382    echo "$as_me:13382: \$? = $ac_status" >&5
     13342   echo "$as_me:13342: \$? = $ac_status" >&5
    1338313343   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1338413344   then
     
    1494614906   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494714907   -e 's:$: $lt_compiler_flag:'`
    14948    (eval echo "\"\$as_me:14948: $lt_compile\"" >&5)
     14908   (eval echo "\"\$as_me:14908: $lt_compile\"" >&5)
    1494914909   (eval "$lt_compile" 2>conftest.err)
    1495014910   ac_status=$?
    1495114911   cat conftest.err >&5
    14952    echo "$as_me:14952: \$? = $ac_status" >&5
     14912   echo "$as_me:14912: \$? = $ac_status" >&5
    1495314913   if (exit $ac_status) && test -s "$ac_outfile"; then
    1495414914     # The compiler can only warn and ignore the option if not recognized
     
    1505015010   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1505115011   -e 's:$: $lt_compiler_flag:'`
    15052    (eval echo "\"\$as_me:15052: $lt_compile\"" >&5)
     15012   (eval echo "\"\$as_me:15012: $lt_compile\"" >&5)
    1505315013   (eval "$lt_compile" 2>out/conftest.err)
    1505415014   ac_status=$?
    1505515015   cat out/conftest.err >&5
    15056    echo "$as_me:15056: \$? = $ac_status" >&5
     15016   echo "$as_me:15016: \$? = $ac_status" >&5
    1505715017   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1505815018   then
     
    1725717217   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725817218   -e 's:$: $lt_compiler_flag:'`
    17259    (eval echo "\"\$as_me:17259: $lt_compile\"" >&5)
     17219   (eval echo "\"\$as_me:17219: $lt_compile\"" >&5)
    1726017220   (eval "$lt_compile" 2>conftest.err)
    1726117221   ac_status=$?
    1726217222   cat conftest.err >&5
    17263    echo "$as_me:17263: \$? = $ac_status" >&5
     17223   echo "$as_me:17223: \$? = $ac_status" >&5
    1726417224   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726517225     # The compiler can only warn and ignore the option if not recognized
     
    1752517485   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752617486   -e 's:$: $lt_compiler_flag:'`
    17527    (eval echo "\"\$as_me:17527: $lt_compile\"" >&5)
     17487   (eval echo "\"\$as_me:17487: $lt_compile\"" >&5)
    1752817488   (eval "$lt_compile" 2>conftest.err)
    1752917489   ac_status=$?
    1753017490   cat conftest.err >&5
    17531    echo "$as_me:17531: \$? = $ac_status" >&5
     17491   echo "$as_me:17491: \$? = $ac_status" >&5
    1753217492   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753317493     # The compiler can only warn and ignore the option if not recognized
     
    1762917589   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1763017590   -e 's:$: $lt_compiler_flag:'`
    17631    (eval echo "\"\$as_me:17631: $lt_compile\"" >&5)
     17591   (eval echo "\"\$as_me:17591: $lt_compile\"" >&5)
    1763217592   (eval "$lt_compile" 2>out/conftest.err)
    1763317593   ac_status=$?
    1763417594   cat out/conftest.err >&5
    17635    echo "$as_me:17635: \$? = $ac_status" >&5
     17595   echo "$as_me:17595: \$? = $ac_status" >&5
    1763617596   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1763717597   then
     
    2051920479  dependency_linking="$enableval"
    2052020480else
    20521   dependency_linking=no
     20481  dependency_linking=yes
    2052220482fi;
    2052320483
     
    2079420754COINUTILS_PCLIBS=
    2079520755COINUTILS_PCREQUIRES=
    20796 COINUTILS_DATA=
    2079720756
    2079820757
     
    2131021269OSI_PCLIBS=
    2131121270OSI_PCREQUIRES=
    21312 OSI_DATA=
    2131321271
    2131421272
     
    2182121779OSITESTS_PCLIBS=
    2182221780OSITESTS_PCREQUIRES=
    21823 OSITESTS_DATA=
    2182421781
    2182521782
     
    2230222259SAMPLE_PCLIBS=
    2230322260SAMPLE_PCREQUIRES=
    22304 SAMPLE_DATA=
    2230522261
    2230622262
     
    2278322739NETLIB_PCLIBS=
    2278422740NETLIB_PCREQUIRES=
    22785 NETLIB_DATA=
    2278622741
    2278722742
     
    2369823653GLPK_PCLIBS=
    2369923654GLPK_PCREQUIRES=
    23700 GLPK_DATA=
    2370123655
    2370223656
     
    2423324187MUMPS_PCLIBS=
    2423424188MUMPS_PCREQUIRES=
    24235 MUMPS_DATA=
    2423624189
    2423724190
     
    2474124694
    2474224695
    24743 
    2474424696ac_ext=f
    2474524697ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
     
    2495124903
    2495224904# Provide some information about the compiler.
    24953 echo "$as_me:24953:" \
     24905echo "$as_me:24905:" \
    2495424906     "checking for Fortran 77 compiler version" >&5
    2495524907ac_compiler=`set X $ac_compile; echo $2`
     
    2539525347case "$F77" in
    2539625348  ifort* | */ifort* | IFORT* | */IFORT*)
    25397 
    25398  case $build in
    25399   *-mingw*)
    25400     if test "${LD+set}" = set; then :; else
    25401       LD=link
    25402     fi
    25403     ;;
    25404  esac
    25405  if test $enable_msvc = yes ; then
    25406    if test "x${LD+set}" = xset; then :; else
    25407      LD=link
    25408    fi
    25409  fi
    25410 
     25349    LD=link
    2541125350    ;;
    2541225351esac
     
    2547225411ac_save_FFLAGS=$FFLAGS
    2547325412FFLAGS="$FFLAGS $ac_verb"
    25474 (eval echo $as_me:25474: \"$ac_link\") >&5
     25413(eval echo $as_me:25413: \"$ac_link\") >&5
    2547525414ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2547625415echo "$ac_f77_v_output" >&5
     
    2555025489ac_save_FFLAGS=$FFLAGS
    2555125490FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    25552 (eval echo $as_me:25552: \"$ac_link\") >&5
     25491(eval echo $as_me:25491: \"$ac_link\") >&5
    2555325492ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    2555425493echo "$ac_f77_v_output" >&5
     
    2913929078BLAS_PCLIBS=
    2914029079BLAS_PCREQUIRES=
    29141 BLAS_DATA=
    2914229080
    2914329081
     
    2979729735ASL_PCLIBS=
    2979829736ASL_PCREQUIRES=
    29799 ASL_DATA=
    2980029737
    2980129738
  • trunk/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r2083 r2088  
    59285928  writeLp(fp, epsilon, numberAcross,
    59295929          decimals, objSense,changeNameOnRange);
     5930  fclose(fp);
    59305931}
    59315932void
Note: See TracChangeset for help on using the changeset viewer.