Changes in / [492:b9b3473327e3:490:2eb5c8ca2c91] in lemon-main

Location:

lemon

Files:

• CMakeLists.txt (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• bits/windows.cc (deleted)
• bits/windows.h (deleted)
• graph_to_eps.h (modified) (3 diffs)
• random.h (modified) (2 diffs)
• time_measure.h (modified) (2 diffs)

lemon/CMakeLists.txt

@@ -15 +15 @@
   lp_base.cc
   lp_skeleton.cc
-  random.cc
-  bits/windows.cc
-)
+  random.cc)
 
 IF(HAVE_GLPK)

lemon/Makefile.am

@@ -13 +13 @@
         lemon/lp_base.cc \
         lemon/lp_skeleton.cc \
-        lemon/random.cc \
-        lemon/bits/windows.cc
+        lemon/random.cc
 
 
@@ -92 +91 @@
         lemon/time_measure.h \
         lemon/tolerance.h \
-        lemon/unionfind.h \
-        lemon/bits/windows.h
+        lemon/unionfind.h
 
 bits_HEADERS += \

lemon/graph_to_eps.h

@@ -30 +30 @@
 #include<ctime>
 #else
-#include<lemon/bits/windows.h>
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#ifndef NOMINMAX
+#define NOMINMAX
+#endif
+#include<windows.h>
 #endif
 
@@ -678 +684 @@
 
     {
-      os << "%%CreationDate: ";
 #ifndef WIN32
       timeval tv;
@@ -685 +690 @@
       char cbuf[26];
       ctime_r(&tv.tv_sec,cbuf);
-      os << cbuf;
+      os << "%%CreationDate: " << cbuf;
 #else
-      os << bits::getWinFormattedDate();
+      SYSTEMTIME time;
+      GetSystemTime(&time);
+#if defined(_MSC_VER) && (_MSC_VER < 1500)
+      LPWSTR buf1, buf2, buf3;
+      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                        L"ddd MMM dd", buf1, 11) &&
+          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
+                        L"HH':'mm':'ss", buf2, 9) &&
+          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
+                        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
-    }
-    os << std::endl;
+#endif
+    }
 
     if (_autoArcWidthScale) {

lemon/random.h

@@ -78 +78 @@
 #include <unistd.h>
 #else
-#include <lemon/bits/windows.h>
+#include <windows.h>
 #endif
 
@@ -663 +663 @@
       seed(getpid() + tv.tv_sec + tv.tv_usec);
 #else
-      seed(bits::getWinRndSeed());
+      FILETIME time;
+      GetSystemTimeAsFileTime(&time);
+      seed(GetCurrentProcessId() + time.dwHighDateTime + time.dwLowDateTime);
 #endif
       return true;

lemon/time_measure.h

@@ -25 +25 @@
 
 #ifdef WIN32
-#include <lemon/bits/windows.h>
+#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>
@@ -86 +93 @@
       cstime=ts.tms_cstime/tck;
 #else
-      bits::getWinProcTimes(rtime, utime, stime, cutime, cstime);
+      static const double ch = 4294967296.0e-7;
+      static const double cl = 1.0e-7;
+
+      FILETIME system;
+      GetSystemTimeAsFileTime(&system);
+      rtime = ch * system.dwHighDateTime + cl * system.dwLowDateTime;
+
+      FILETIME create, exit, kernel, user;
+      if (GetProcessTimes(GetCurrentProcess(),&create, &exit, &kernel, &user)) {
+        utime = ch * user.dwHighDateTime + cl * user.dwLowDateTime;
+        stime = ch * kernel.dwHighDateTime + cl * kernel.dwLowDateTime;
+        cutime = 0;
+        cstime = 0;
+      } else {
+        rtime = 0;
+        utime = 0;
+        stime = 0;
+        cutime = 0;
+        cstime = 0;
+      }
 #endif
     }