COIN-OR::LEMON - Graph Library

Ticket #230: dbfb21a939d6.patch

File dbfb21a939d6.patch, 2.9 KB (added by Balazs Dezso, 15 years ago)

Long long checking in build environment

  • CMakeLists.txt

    # HG changeset patch
    # User Balazs Dezso <deba@inf.elte.hu>
    # Date 1235146178 -3600
    # Node ID dbfb21a939d625a8d12958800cb06f800bd38d21
    # Parent  b9b3473327e344ba8647be9f8c674644892e25d1
    Add long long checking to build systems
    
    diff -r b9b3473327e3 -r dbfb21a939d6 CMakeLists.txt
    a b  
    3232  SET(HAVE_GLPK TRUE)
    3333ENDIF(GLPK_FOUND)
    3434
     35INCLUDE(CheckTypeSize)
     36CHECK_TYPE_SIZE("long long" LONG_LONG)
     37
    3538ENABLE_TESTING()
    3639
    3740ADD_SUBDIRECTORY(lemon)
  • configure.ac

    diff -r b9b3473327e3 -r dbfb21a939d6 configure.ac
    a b  
    2222dnl Do compilation tests using the C++ compiler.
    2323AC_LANG([C++])
    2424
     25dnl Check the existence of long long type.
     26AC_CHECK_TYPE(long long, [long_long_found=yes], [long_long_found=no])
     27if test x"$long_long_found" = x"yes"; then
     28  AC_DEFINE([HAVE_LONG_LONG], [1], [Define to 1 if you have long long.])
     29fi
     30
    2531dnl Checks for programs.
    2632AC_PROG_CXX
    2733AC_PROG_CXXCPP
  • lemon/bits/default_map.h

    diff -r b9b3473327e3 -r dbfb21a939d6 lemon/bits/default_map.h
    a b  
    9696  };
    9797
    9898
    99 #if defined __GNUC__ && !defined __STRICT_ANSI__
     99#if defined HAVE_LONG_LONG
    100100
    101101  // long long
    102102  template <typename _Graph, typename _Item>
  • lemon/config.h.cmake

    diff -r b9b3473327e3 -r dbfb21a939d6 lemon/config.h.cmake
    a b  
    11#cmakedefine HAVE_LP 1
    22#cmakedefine HAVE_MIP 1
    33#cmakedefine HAVE_GLPK 1
     4#cmakedefine HAVE_LONG_LONG 1
  • lemon/config.h.in

    diff -r b9b3473327e3 -r dbfb21a939d6 lemon/config.h.in
    a b  
    1515
    1616/* Define to 1 if you have CLP */
    1717#undef HAVE_CLP
     18
     19/* Define to 1 if you have long long */
     20#undef HAVE_LONG_LONG
  • lemon/lp_skeleton.cc

    diff -r b9b3473327e3 -r dbfb21a939d6 lemon/lp_skeleton.cc
    a b  
    7070  {  return 0; }
    7171
    7272  void SkeletonSolverBase::_setObjCoeffs(ExprIterator, ExprIterator) {}
    73   void SkeletonSolverBase::_getObjCoeffs(InsertIterator) const {};
     73  void SkeletonSolverBase::_getObjCoeffs(InsertIterator) const {}
    7474
    7575  void SkeletonSolverBase::_setObjCoeff(int, Value) {}
    7676  SkeletonSolverBase::Value SkeletonSolverBase::_getObjCoeff(int) const
  • lemon/tolerance.h

    diff -r b9b3473327e3 -r dbfb21a939d6 lemon/tolerance.h
    a b  
    371371    static Value zero() {return 0;}
    372372  };
    373373
    374 #if defined __GNUC__ && !defined __STRICT_ANSI__
     374#if HAVE_LONG_LONG
    375375
    376376  ///Long long integer specialization of Tolerance.
    377377