COIN-OR::LEMON - Graph Library

Changeset 1343:20f95cd51aba in lemon


Ignore:
Timestamp:
04/28/15 18:13:42 (4 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
1339:93d455c647be (diff), 1341:c199e9976d93 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Phase:
public
Message:

Merge bugfix #595

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • CMakeLists.txt

    r1337 r1343  
    7171FIND_PACKAGE(Ghostscript)
    7272
     73IF(WIN32)
     74  SET(LEMON_WIN32 TRUE)
     75ENDIF(WIN32)
     76
    7377SET(LEMON_ENABLE_GLPK YES CACHE STRING "Enable GLPK solver backend.")
    7478SET(LEMON_ENABLE_ILOG YES CACHE STRING "Enable ILOG (CPLEX) solver backend.")
  • CMakeLists.txt

    r1340 r1343  
    44  CMAKE_POLICY(SET CMP0048 OLD)
    55ENDIF(POLICY CMP0048)
     6
     7IF(POLICY CMP0043)
     8  CMAKE_POLICY(SET CMP0043 OLD)
     9ENDIF(POLICY CMP0043)
    610
    711SET(PROJECT_NAME "LEMON")
     
    230234    FORCE )
    231235
     236SET_DIRECTORY_PROPERTIES(PROPERTIES
     237  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
     238  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
     239)
    232240
    233241INCLUDE(CheckTypeSize)
     
    258266
    259267ENABLE_TESTING()
     268
     269
     270INCLUDE(CheckCXXCompilerFlag)
     271CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11)
     272IF(LEMON_CXX11)
     273  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     274ENDIF()
     275
    260276
    261277IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
  • lemon/config.h.in

    r1337 r1343  
     1#ifndef LEMON_CONFIG_H
     2#define LEMON_CONFIG_H
     3
    14#define LEMON_VERSION "@PROJECT_VERSION@"
    25#cmakedefine LEMON_HAVE_LONG_LONG 1
    36
    47#cmakedefine LEMON_CXX11 1
     8
     9#cmakedefine LEMON_WIN32 1
    510
    611#cmakedefine LEMON_HAVE_LP 1
     
    1217#cmakedefine LEMON_HAVE_CBC 1
    1318
    14 #define _LEMON_CPLEX 1
    15 #define _LEMON_CLP 2
    16 #define _LEMON_GLPK 3
    17 #define _LEMON_SOPLEX 4
    18 #define _LEMON_CBC 5
     19#define LEMON_CPLEX_ 1
     20#define LEMON_CLP_ 2
     21#define LEMON_GLPK_ 3
     22#define LEMON_SOPLEX_ 4
     23#define LEMON_CBC_ 5
    1924
    20 #cmakedefine LEMON_DEFAULT_LP _LEMON_@LEMON_DEFAULT_LP@
    21 #cmakedefine LEMON_DEFAULT_MIP _LEMON_@LEMON_DEFAULT_MIP@
     25#cmakedefine LEMON_DEFAULT_LP LEMON_@LEMON_DEFAULT_LP@_
     26#cmakedefine LEMON_DEFAULT_MIP LEMON_@LEMON_DEFAULT_MIP@_
    2227
    2328#cmakedefine LEMON_USE_PTHREAD 1
    2429#cmakedefine LEMON_USE_WIN32_THREADS 1
     30
     31#endif
  • lemon/config.h.in

    r1340 r1343  
    44#define LEMON_VERSION "@PROJECT_VERSION@"
    55#cmakedefine LEMON_HAVE_LONG_LONG 1
     6
     7#cmakedefine LEMON_CXX11 1
    68
    79#cmakedefine LEMON_WIN32 1
  • lemon/random.h

    r1338 r1343  
    6363#define LEMON_RANDOM_H
    6464
     65#include <lemon/config.h>
     66
    6567#include <algorithm>
    6668#include <iterator>
     
    7274#include <lemon/dim2.h>
    7375
    74 #ifndef WIN32
     76#ifndef LEMON_WIN32
    7577#include <sys/time.h>
    7678#include <ctime>
     
    606608    /// \return Currently always \c true.
    607609    bool seed() {
    608 #ifndef WIN32
     610#ifndef LEMON_WIN32
    609611      if (seedFromFile("/dev/urandom", 0)) return true;
    610612#endif
     
    626628    /// \param offset The offset, from the file read.
    627629    /// \return \c true when the seeding successes.
    628 #ifndef WIN32
     630#ifndef LEMON_WIN32
    629631    bool seedFromFile(const std::string& file = "/dev/urandom", int offset = 0)
    630632#else
     
    648650    /// \return Currently always \c true.
    649651    bool seedFromTime() {
    650 #ifndef WIN32
     652#ifndef LEMON_WIN32
    651653      timeval tv;
    652654      gettimeofday(&tv, 0);
  • lemon/random.h

    r1340 r1343  
    252252        current = state + length;
    253253
    254         register Word *curr = state + length - 1;
    255         register long num;
     254        Word *curr = state + length - 1;
     255        long num;
    256256
    257257        num = length - shift;
Note: See TracChangeset for help on using the changeset viewer.