Changes in / [559:9b9ffe7d9b75:560:2a136de8e3f2] in lemon

Location:

lemon

Files:

• graph_to_eps.h (modified) (2 diffs)
• lp_base.cc (modified) (1 diff)
• lp_base.h (modified) (5 diffs)
• math.h (modified) (1 diff)
• time_measure.h (modified) (1 diff)

lemon/graph_to_eps.h

@@ -30 +30 @@
 #include<ctime>
 #else
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include<windows.h>
 #endif
@@ -689 +693 @@
 #else
       SYSTEMTIME time;
-      char buf1[11], buf2[9], buf3[5];
-
       GetSystemTime(&time);
+#if defined(_MSC_VER) && (_MSC_VER < 1500)
+      LPWSTR buf1, buf2, buf3;
       if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
-                        "ddd MMM dd", buf1, 11) &&
+                        L"ddd MMM dd", buf1, 11) &&
           GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
-                        "HH':'mm':'ss", buf2, 9) &&
+                        L"HH':'mm':'ss", buf2, 9) &&
           GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
-                                "yyyy", buf3, 5)) {
+                        L"yyyy", buf3, 5)) {
         os << "%%CreationDate: " << buf1 << ' '
            << buf2 << ' ' << buf3 << std::endl;
       }
+#else
+        char buf1[11], buf2[9], buf3[5];
+        if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                          "ddd MMM dd", buf1, 11) &&
+            GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
+                          "HH':'mm':'ss", buf2, 9) &&
+            GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                          "yyyy", buf3, 5)) {
+          os << "%%CreationDate: " << buf1 << ' '
+             << buf2 << ' ' << buf3 << std::endl;
+        }
+#endif
 #endif
     }

lemon/lp_base.cc

@@ -23 +23 @@
 namespace lemon {
 
-  const LpBase::Value LpBase::INF = std::numeric_limits<Value>::infinity();
-  const LpBase::Value LpBase::NaN = std::numeric_limits<Value>::quiet_NaN();
+  const LpBase::Value LpBase::INF =
+    std::numeric_limits<LpBase::Value>::infinity();
+  const LpBase::Value LpBase::NaN =
+    std::numeric_limits<LpBase::Value>::quiet_NaN();
 
 } //namespace lemon

lemon/lp_base.h

@@ -598 +598 @@
       ///Is the constraint lower bounded?
       bool lowerBounded() const {
-        return _lb != -INF && !isnan(_lb);
+        return _lb != -INF && !isNaN(_lb);
       }
       ///Is the constraint upper bounded?
       bool upperBounded() const {
-        return _ub != INF && !isnan(_ub);
+        return _ub != INF && !isNaN(_ub);
       }
 
@@ -1667 +1667 @@
                                    const LpBase::Constr &c) {
     LpBase::Constr tmp(c);
-    LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");
+    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");
     tmp.lowerBound()=n;
     return tmp;
@@ -1679 +1679 @@
   {
     LpBase::Constr tmp(c);
-    LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");
+    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");
     tmp.upperBound()=n;
     return tmp;
@@ -1691 +1691 @@
                                    const LpBase::Constr &c) {
     LpBase::Constr tmp(c);
-    LEMON_ASSERT(isnan(tmp.upperBound()), "Wrong LP constraint");
+    LEMON_ASSERT(isNaN(tmp.upperBound()), "Wrong LP constraint");
     tmp.upperBound()=n;
     return tmp;
@@ -1703 +1703 @@
   {
     LpBase::Constr tmp(c);
-    LEMON_ASSERT(isnan(tmp.lowerBound()), "Wrong LP constraint");
+    LEMON_ASSERT(isNaN(tmp.lowerBound()), "Wrong LP constraint");
     tmp.lowerBound()=n;
     return tmp;

lemon/math.h

@@ -61 +61 @@
   ///Is should be equivalent with std::isnan(), but it is not
   ///provided by all compilers.
-  inline bool isnan(double v)
+  inline bool isNaN(double v)
     {
       return v!=v;

lemon/time_measure.h

@@ -25 +25 @@
 
 #ifdef WIN32
+#ifndef WIN32_LEAN_AND_MEAN
 #define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
 #define NOMINMAX
+#endif
 #include <windows.h>
 #include <cmath>
 #else
+#include <unistd.h>
 #include <sys/times.h>
 #include <sys/time.h>