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
... ... 
@@ -42,25 +42,25 @@
42 42 
SET(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
43 43 

			




	44
	44
	
		
FIND_PACKAGE(Doxygen)


			




	45
	45
	
		
FIND_PACKAGE(Ghostscript)


			




	46
	46
	
		
FIND_PACKAGE(GLPK 4.33)


			




	47
	47
	
		
FIND_PACKAGE(CPLEX)


			




	48
	48
	
		
FIND_PACKAGE(COIN)


			




	49
	49
	
		

			




	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.


			




	59
	59
	
		
    # Still keep it as an example.


			




	60
	60
	
		
    SET(CXX_WARNING "/wd4250 /wd4355 /wd4503 /wd4800 /wd4996")


			




	61
	61
	
		
    # Suppressed warnings:


			




	62
	62
	
		
    # C4250: 'class1' : inherits 'class2::member' via dominance


			




	63
	63
	
		
    # C4355: 'this' : used in base member initializer list


			




	64
	64
	
		
    # C4503: 'function' : decorated name length exceeded, name was truncated


			




	65
	65
	
		
    # C4800: 'type' : forcing value to bool 'true' or 'false'


			




	66
	66
	
		
    #        (performance warning)

			




        

    

    

    

        

            

                

                    lemon/bits/windows.cc
                

                

                  
                  
                  
                  Ignore white space
                  24 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -31,25 +31,27 @@


			




	31
	31
	
		
#ifdef UNICODE


			




	32
	32
	
		
#undef UNICODE


			




	33
	33
	
		
#endif


			




	34
	34
	
		
#include <windows.h>


			




	35
	35
	
		
#ifdef LOCALE_INVARIANT


			




	36
	36
	
		
#define MY_LOCALE LOCALE_INVARIANT


			




	37
	37
	
		
#else


			




	38
	38
	
		
#define MY_LOCALE LOCALE_NEUTRAL


			




	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>


			




	48
	50
	
		
#include <sstream>


			




	49
	51
	
		

			




	50
	52
	
		
namespace lemon {


			




	51
	53
	
		
  namespace bits {


			




	52
	54
	
		
    void getWinProcTimes(double &rtime,


			




	53
	55
	
		
                         double &utime, double &stime,


			




	54
	56
	
		
                         double &cutime, double &cstime)


			




	55
	57
	
		
    {


			




        

    






    
    



    


    

     
    
0 comments (0 inline)