Changeset - r510:5a894f2d9325
« 509:daddd6
« 506:7e0d5d
512:65f80c »
gravatar
alpar (Alpar Juttner)
alpar@cs.elte.hu
Merge VS and AIX related fixes
0 2 0
merge 1.0
0 files changed with 23 insertions and 2 deletions:
lemon/graph_to_eps.h
18
2
lemon/time_measure.h
5
↑ Collapse diff ↑
lemon/graph_to_eps.h
Show white space 8 line context
... ... 
@@ -28,10 +28,14 @@
28 28 
#ifndef WIN32
29 29 
#include<sys/time.h>
30 30 
#include<ctime>
31 31 
#else
32 
#ifndef WIN32_LEAN_AND_MEAN
32 33 
#define WIN32_LEAN_AND_MEAN
34 
#endif
35 
#ifndef NOMINMAX
33 36 
#define NOMINMAX
37 
#endif
34 38 
#include<windows.h>
35 39 
#endif
36 40 

			




	37
	41
	
		
#include<lemon/math.h>


			




	...
	...
	
		
@@ -687,11 +691,22 @@


			




	687
	691
	
		
      ctime_r(&tv.tv_sec,cbuf);


			




	688
	692
	
		
      os << "%%CreationDate: " << cbuf;


			




	689
	693
	
		
#else


			




	690
	694
	
		
      SYSTEMTIME time;


			




	
	695
	
		
      GetSystemTime(&time);


			




	
	696
	
		
#if defined(_MSC_VER) && (_MSC_VER < 1500)


			




	
	697
	
		
      LPWSTR buf1, buf2, buf3;


			




	
	698
	
		
      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	
	699
	
		
                        L"ddd MMM dd", buf1, 11) &&


			




	
	700
	
		
          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	
	701
	
		
                        L"HH':'mm':'ss", buf2, 9) &&


			




	
	702
	
		
          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	
	703
	
		
                        L"yyyy", buf3, 5)) {


			




	
	704
	
		
        os << "%%CreationDate: " << buf1 << ' '


			




	
	705
	
		
           << buf2 << ' ' << buf3 << std::endl;


			




	
	706
	
		
      }


			




	
	707
	
		
#else


			




	691
	708
	
		
      char buf1[11], buf2[9], buf3[5];


			




	692
	
	
		

			




	693
	
	
		
      GetSystemTime(&time);


			




	694
	709
	
		
      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	695
	710
	
		
                        "ddd MMM dd", buf1, 11) &&


			




	696
	711
	
		
          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	697
	712
	
		
                        "HH':'mm':'ss", buf2, 9) &&


			




	...
	...
	
		
@@ -700,8 +715,9 @@


			




	700
	715
	
		
        os << "%%CreationDate: " << buf1 << ' '


			




	701
	716
	
		
           << buf2 << ' ' << buf3 << std::endl;


			




	702
	717
	
		
      }


			




	703
	718
	
		
#endif


			




	
	719
	
		
#endif


			




	704
	720
	
		
    }


			




	705
	721
	
		

			




	706
	722
	
		
    if (_autoArcWidthScale) {


			




	707
	723
	
		
      double max_w=0;

			




        

    

    

    

        

            

                

                    lemon/time_measure.h
                

                

                  
                  
                  
                  Show white space
                  8 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -23,13 +23,18 @@


			




	23
	23
	
		
///\file


			




	24
	24
	
		
///\brief Tools for measuring cpu usage


			




	25
	25
	
		

			




	26
	26
	
		
#ifdef WIN32


			




	
	27
	
		
#ifndef WIN32_LEAN_AND_MEAN


			




	27
	28
	
		
#define WIN32_LEAN_AND_MEAN


			




	
	29
	
		
#endif


			




	
	30
	
		
#ifndef NOMINMAX


			




	28
	31
	
		
#define NOMINMAX


			




	
	32
	
		
#endif


			




	29
	33
	
		
#include <windows.h>


			




	30
	34
	
		
#include <cmath>


			




	31
	35
	
		
#else


			




	
	36
	
		
#include <unistd.h>


			




	32
	37
	
		
#include <sys/times.h>


			




	33
	38
	
		
#include <sys/time.h>


			




	34
	39
	
		
#endif


			




	35
	40
	
		

			




        

    






    
    



    


    

     
    
0 comments (0 inline)