Resolve several MSVC related compilation problems
authorAlpar Juttner <alpar@cs.elte.hu>
Tue, 22 Apr 2008 17:12:40 +0100
changeset 143c3b45bb643b0
parent 142 8b703d177341
child 144 4e626dbbe408
Resolve several MSVC related compilation problems
demo/lgf_demo.cc
lemon/graph_to_eps.h
lemon/time_measure.h
     1.1 --- a/demo/lgf_demo.cc	Sun Apr 13 20:15:45 2008 +0200
     1.2 +++ b/demo/lgf_demo.cc	Tue Apr 22 17:12:40 2008 +0100
     1.3 @@ -37,7 +37,7 @@
     1.4  
     1.5  int main(int argc, const char *argv[]) {
     1.6    const int n = argc > 1 ? std::atoi(argv[1]) : 20;
     1.7 -  const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * log(n));
     1.8 +  const int e = argc > 2 ? std::atoi(argv[2]) : static_cast<int>(n * std::log(double(n)));
     1.9    const int m = argc > 3 ? std::atoi(argv[3]) : 100;
    1.10  
    1.11    SmartDigraph digraph;
     2.1 --- a/lemon/graph_to_eps.h	Sun Apr 13 20:15:45 2008 +0200
     2.2 +++ b/lemon/graph_to_eps.h	Tue Apr 22 17:12:40 2008 +0100
     2.3 @@ -29,6 +29,8 @@
     2.4  #include<sys/time.h>
     2.5  #include<ctime>
     2.6  #else
     2.7 +#define WIN32_LEAN_AND_MEAN
     2.8 +#define NOMINMAX
     2.9  #include<windows.h>
    2.10  #endif
    2.11  
     3.1 --- a/lemon/time_measure.h	Sun Apr 13 20:15:45 2008 +0200
     3.2 +++ b/lemon/time_measure.h	Tue Apr 22 17:12:40 2008 +0100
     3.3 @@ -24,6 +24,8 @@
     3.4  ///\brief Tools for measuring cpu usage
     3.5  
     3.6  #ifdef WIN32
     3.7 +#define WIN32_LEAN_AND_MEAN
     3.8 +#define NOMINMAX
     3.9  #include <windows.h>
    3.10  #include <cmath>
    3.11  #else
    3.12 @@ -31,6 +33,7 @@
    3.13  #include <sys/time.h>
    3.14  #endif
    3.15  
    3.16 +#include <string>
    3.17  #include <fstream>
    3.18  #include <iostream>
    3.19