# HG changeset patch # User Alpar Juttner # Date 2008-04-22 18:12:40 # Node ID c3b45bb643b0e815a61800b465ebb9e2b98e0397 # Parent 8b703d1773410c87205b431e00718611c2912759 Resolve several MSVC related compilation problems diff --git a/demo/lgf_demo.cc b/demo/lgf_demo.cc --- a/demo/lgf_demo.cc +++ b/demo/lgf_demo.cc @@ -37,7 +37,7 @@ 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(n * log(n)); + const int e = argc > 2 ? std::atoi(argv[2]) : static_cast(n * std::log(double(n))); const int m = argc > 3 ? std::atoi(argv[3]) : 100; SmartDigraph digraph; diff --git a/lemon/graph_to_eps.h b/lemon/graph_to_eps.h --- a/lemon/graph_to_eps.h +++ b/lemon/graph_to_eps.h @@ -29,6 +29,8 @@ #include #include #else +#define WIN32_LEAN_AND_MEAN +#define NOMINMAX #include #endif diff --git a/lemon/time_measure.h b/lemon/time_measure.h --- a/lemon/time_measure.h +++ b/lemon/time_measure.h @@ -24,6 +24,8 @@ ///\brief Tools for measuring cpu usage #ifdef WIN32 +#define WIN32_LEAN_AND_MEAN +#define NOMINMAX #include #include #else @@ -31,6 +33,7 @@ #include #endif +#include #include #include