Changeset 562:b9b3473327e3 in lemon for lemon/graph_to_eps.h

Timestamp:

02/16/09 19:15:52 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

561:2eb5c8ca2c91 (diff), 511:879c55700cd4 (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

Files:

• lemon/graph_to_eps.h (modified) (1 diff)
• lemon/graph_to_eps.h (modified) (3 diffs)

lemon/graph_to_eps.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2009
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).

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>
+#include<lemon/bits/windows.h>
 #endif
 
@@ -684 +678 @@
 
     {
+      os << "%%CreationDate: ";
 #ifndef WIN32
       timeval tv;
@@ -690 +685 @@
       char cbuf[26];
       ctime_r(&tv.tv_sec,cbuf);
-      os << "%%CreationDate: " << cbuf;
+      os << cbuf;
 #else
-      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;
-        }
+      os << bits::getWinFormattedDate();
 #endif
-#endif
-    }
+    }
+    os << std::endl;
 
     if (_autoArcWidthScale) {