Changeset - r1055:60f4aaedb20f
« 1053:64260c
« 1051:cc9bb4
1058:d9a2bf »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge #418 to branch 1.2
0 2 0
merge 1.2
2 files changed with 3 insertions and 1 deletions:
CMakeLists.txt
1
1
lemon/bits/windows.cc
2
↑ Collapse diff ↑
CMakeLists.txt
Ignore white space 6 line context
... ... 
@@ -50,9 +50,9 @@
50 50 
IF(DEFINED ENV{LEMON_CXX_WARNING})
51 51 
  SET(CXX_WARNING $ENV{LEMON_CXX_WARNING})
52 52 
ELSE()
53 53 
  IF(CMAKE_COMPILER_IS_GNUCXX)
54 
    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")
54 
    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")
55 55 
    SET(CMAKE_CXX_FLAGS_DEBUG CACHE STRING "-ggdb")
56 56 
    SET(CMAKE_C_FLAGS_DEBUG CACHE STRING "-ggdb")
57 57 
  ELSEIF(MSVC)
58 58 
    # This part is unnecessary 'casue the same is set by the lemon/core.h.
lemon/bits/windows.cc
Ignore white space 8 line context
... ... 
@@ -39,9 +39,11 @@
39 39 
#endif
40 40 
#else
41 41 
#include <unistd.h>
42 42 
#include <ctime>
43 
#ifndef WIN32
43 44 
#include <sys/times.h>
45 
#endif
44 46 
#include <sys/time.h>
45 47 
#endif
46 48 

			




	47
	49
	
		
#include <cmath>


			




        

    






    
    



    


    

     
    
0 comments (0 inline)