Merge #418 to branch 1.1 1.1
authorAlpar Juttner <alpar@cs.elte.hu>
Tue, 12 Apr 2011 07:46:34 +0200
branch1.1
changeset 750632a72b27123
parent 748 c1e8f6342149
parent 749 64260c0f58eb
child 755 40bbb450143e
Merge #418 to branch 1.1
     1.1 --- a/CMakeLists.txt	Thu Mar 17 18:12:57 2011 +0100
     1.2 +++ b/CMakeLists.txt	Tue Apr 12 07:46:34 2011 +0200
     1.3 @@ -51,7 +51,7 @@
     1.4    SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
     1.5  ELSE()
     1.6    IF(CMAKE_COMPILER_IS_GNUCXX)
     1.7 -    SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -ansi -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas")
     1.8 +    SET(CXX_WARNING "-Wall -W -Wunused -Wformat=2 -Wctor-dtor-privacy -Wnon-virtual-dtor -Wno-char-subscripts -Wwrite-strings -Wno-char-subscripts -Wreturn-type -Wcast-qual -Wcast-align -Wsign-promo -Woverloaded-virtual -fno-strict-aliasing -Wold-style-cast -Wno-unknown-pragmas")
     1.9      SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
    1.10      SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
    1.11    ELSEIF(MSVC)
     2.1 --- a/lemon/bits/windows.cc	Thu Mar 17 18:12:57 2011 +0100
     2.2 +++ b/lemon/bits/windows.cc	Tue Apr 12 07:46:34 2011 +0200
     2.3 @@ -40,7 +40,9 @@
     2.4  #else
     2.5  #include <unistd.h>
     2.6  #include <ctime>
     2.7 +#ifndef WIN32
     2.8  #include <sys/times.h>
     2.9 +#endif
    2.10  #include <sys/time.h>
    2.11  #endif
    2.12