Changeset 1136:20f95cd51aba in lemon-main

Timestamp:

04/28/15 18:13:42 (10 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

1133:93d455c647be (diff), 1135: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:

• CMakeLists.txt (modified) (1 diff)
• CMakeLists.txt (modified) (3 diffs)
• lemon/config.h.in (modified) (2 diffs)
• lemon/config.h.in (modified) (1 diff)
• lemon/random.h (modified) (5 diffs)
• lemon/random.h (modified) (1 diff)

CMakeLists.txt

@@ -71 +71 @@
 FIND_PACKAGE(Ghostscript)
 
+IF(WIN32)
+  SET(LEMON_WIN32 TRUE)
+ENDIF(WIN32)
+
 SET(LEMON_ENABLE_GLPK YES CACHE STRING "Enable GLPK solver backend.")
 SET(LEMON_ENABLE_ILOG YES CACHE STRING "Enable ILOG (CPLEX) solver backend.")

CMakeLists.txt

@@ -4 +4 @@
   CMAKE_POLICY(SET CMP0048 OLD) 
 ENDIF(POLICY CMP0048)
+
+IF(POLICY CMP0043) 
+  CMAKE_POLICY(SET CMP0043 OLD) 
+ENDIF(POLICY CMP0043)
 
 SET(PROJECT_NAME "LEMON")
@@ -230 +234 @@
     FORCE )
 
+SET_DIRECTORY_PROPERTIES(PROPERTIES
+  COMPILE_DEFINITIONS_DEBUG "LEMON_ENABLE_DEBUG"
+  COMPILE_DEFINITIONS_MAINTAINER "LEMON_ENABLE_DEBUG"
+)
 
 INCLUDE(CheckTypeSize)
@@ -258 +266 @@
 
 ENABLE_TESTING()
+
+
+INCLUDE(CheckCXXCompilerFlag)
+CHECK_CXX_COMPILER_FLAG("-std=c++11" LEMON_CXX11)
+IF(LEMON_CXX11)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+ENDIF()
+
 
 IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")

lemon/config.h.in

@@ +1 @@
+#ifndef LEMON_CONFIG_H
+#define LEMON_CONFIG_H
+
 #define LEMON_VERSION "@PROJECT_VERSION@"
 #cmakedefine LEMON_HAVE_LONG_LONG 1
 
 #cmakedefine LEMON_CXX11 1
+
+#cmakedefine LEMON_WIN32 1
 
 #cmakedefine LEMON_HAVE_LP 1
@@ -12 +17 @@
 #cmakedefine LEMON_HAVE_CBC 1
 
-#define _LEMON_CPLEX 1
-#define _LEMON_CLP 2
-#define _LEMON_GLPK 3
-#define _LEMON_SOPLEX 4
-#define _LEMON_CBC 5
+#define LEMON_CPLEX_ 1
+#define LEMON_CLP_ 2
+#define LEMON_GLPK_ 3
+#define LEMON_SOPLEX_ 4
+#define LEMON_CBC_ 5
 
-#cmakedefine LEMON_DEFAULT_LP _LEMON_@LEMON_DEFAULT_LP@
-#cmakedefine LEMON_DEFAULT_MIP _LEMON_@LEMON_DEFAULT_MIP@
+#cmakedefine LEMON_DEFAULT_LP LEMON_@LEMON_DEFAULT_LP@_
+#cmakedefine LEMON_DEFAULT_MIP LEMON_@LEMON_DEFAULT_MIP@_
 
 #cmakedefine LEMON_USE_PTHREAD 1
 #cmakedefine LEMON_USE_WIN32_THREADS 1
+
+#endif

lemon/config.h.in

@@ -4 +4 @@
 #define LEMON_VERSION "@PROJECT_VERSION@"
 #cmakedefine LEMON_HAVE_LONG_LONG 1
+
+#cmakedefine LEMON_CXX11 1
 
 #cmakedefine LEMON_WIN32 1

lemon/random.h

@@ -63 +63 @@
 #define LEMON_RANDOM_H
 
+#include <lemon/config.h>
+
 #include <algorithm>
 #include <iterator>
@@ -72 +74 @@
 #include <lemon/dim2.h>
 
-#ifndef WIN32
+#ifndef LEMON_WIN32
 #include <sys/time.h>
 #include <ctime>
@@ -606 +608 @@
     /// \return Currently always \c true.
     bool seed() {
-#ifndef WIN32
+#ifndef LEMON_WIN32
       if (seedFromFile("/dev/urandom", 0)) return true;
 #endif
@@ -626 +628 @@
     /// \param offset The offset, from the file read.
     /// \return \c true when the seeding successes.
-#ifndef WIN32
+#ifndef LEMON_WIN32
     bool seedFromFile(const std::string& file = "/dev/urandom", int offset = 0)
 #else
@@ -648 +650 @@
     /// \return Currently always \c true.
     bool seedFromTime() {
-#ifndef WIN32
+#ifndef LEMON_WIN32
       timeval tv;
       gettimeofday(&tv, 0);

lemon/random.h

@@ -252 +252 @@
         current = state + length;
 
-        register Word *curr = state + length - 1;
-        register long num;
+        Word *curr = state + length - 1;
+        long num;
 
         num = length - shift;