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 26 insertions and 5 deletions:
lemon/graph_to_eps.h
21
5
lemon/time_measure.h
5
↑ Collapse diff ↑
lemon/graph_to_eps.h
Ignore white space 12 line context
... ... 
@@ -26,14 +26,18 @@
26 26 
#include<vector>
27 27 

			




	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>


			




	38
	42
	
		
#include<lemon/core.h>


			




	39
	43
	
		
#include<lemon/dim2.h>


			




	...
	...
	
		
@@ -685,24 +689,36 @@


			




	685
	689
	
		

			




	686
	690
	
		
      char cbuf[26];


			




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


			




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


			




	689
	693
	
		
#else


			




	690
	694
	
		
      SYSTEMTIME time;


			




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


			




	692
	
	
		

			




	693
	695
	
		
      GetSystemTime(&time);


			




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


			




	
	697
	
		
      LPWSTR buf1, buf2, buf3;


			




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


			




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


			




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


			




	696
	700
	
		
          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,


			




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


			




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


			




	698
	702
	
		
          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	699
	
	
		
                                "yyyy", buf3, 5)) {


			




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


			




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


			




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


			




	702
	706
	
		
      }


			




	
	707
	
		
#else


			




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


			




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


			




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


			




	
	711
	
		
            GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,


			




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


			




	
	713
	
		
            GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,


			




	
	714
	
		
                          "yyyy", buf3, 5)) {


			




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


			




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


			




	
	717
	
		
        }


			




	
	718
	
		
#endif


			




	703
	719
	
		
#endif


			




	704
	720
	
		
    }


			




	705
	721
	
		

			




	706
	722
	
		
    if (_autoArcWidthScale) {


			




	707
	723
	
		
      double max_w=0;


			




	708
	724
	
		
      for(ArcIt e(g);e!=INVALID;++e)

			




        

    

    

    

        

            

                

                    lemon/time_measure.h
                

                

                  
                  
                  
                  Ignore white space
                  12 line context
                

                
                  
                
            

        

        

            

            



	...
	...
	
		
@@ -21,17 +21,22 @@


			




	21
	21
	
		

			




	22
	22
	
		
///\ingroup timecount


			




	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
	
		

			




	36
	41
	
		
#include <string>


			




	37
	42
	
		
#include <fstream>


			




        

    






    
    



    


    

     
    
0 comments (0 inline)