Changeset 143:c3b45bb643b0 in lemon-1.1

Timestamp:

04/22/08 18:12:40 (17 years ago)

Author:

Alpar Juttner <alpar@…>

Branch:

default

Phase:

public

Message:

Resolve several MSVC related compilation problems

Files:

• demo/lgf_demo.cc (modified) (1 diff)
• lemon/graph_to_eps.h (modified) (1 diff)
• lemon/time_measure.h (modified) (2 diffs)

demo/lgf_demo.cc

@@ -38 +38 @@
 int main(int argc, const char *argv[]) {
   const int n = argc > 1 ? std::atoi(argv[1]) : 20;
-  const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * log(n));
+  const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * std::log(double(n)));
   const int m = argc > 3 ? std::atoi(argv[3]) : 100;
 

lemon/graph_to_eps.h

@@ -30 +30 @@
 #include<ctime>
 #else
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include<windows.h>
 #endif

lemon/time_measure.h

@@ -25 +25 @@
 
 #ifdef WIN32
+#define WIN32_LEAN_AND_MEAN
+#define NOMINMAX
 #include <windows.h>
 #include <cmath>
@@ -32 +34 @@
 #endif
 
+#include <string>
 #include <fstream>
 #include <iostream>