Changeset 485:c5919679af17 in lemon-main

Timestamp:

02/10/09 18:37:59 (16 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Parents:

481:861a9d5ff283 (diff), 484:daddd623ac9a (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

Location:

lemon

Files:

• graph_to_eps.h (modified) (2 diffs)
• graph_to_eps.h (modified) (1 diff)
• time_measure.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/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/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>

lemon/time_measure.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).