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:
↑ Collapse diff ↑
Show white space 24 line context
... ...
@@ -20,26 +20,30 @@
20 20
#define LEMON_GRAPH_TO_EPS_H
21 21

	
22 22
#include<iostream>
23 23
#include<fstream>
24 24
#include<sstream>
25 25
#include<algorithm>
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>
40 44
#include<lemon/maps.h>
41 45
#include<lemon/color.h>
42 46
#include<lemon/bits/bezier.h>
43 47
#include<lemon/error.h>
44 48

	
45 49

	
... ...
@@ -679,37 +683,49 @@
679 683
    os << "%%Creator: LEMON, graphToEps()\n";
680 684

	
681 685
    {
682 686
#ifndef WIN32
683 687
      timeval tv;
684 688
      gettimeofday(&tv, 0);
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;
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) &&
698 713
          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
699 714
                                "yyyy", buf3, 5)) {
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;
708 724
      for(ArcIt e(g);e!=INVALID;++e)
709 725
        max_w=std::max(double(_arcWidths[e]),max_w);
710 726
      if(max_w>EPSILON) {
711 727
        _arcWidthScale/=max_w;
712 728
      }
713 729
    }
714 730

	
715 731
    if (_autoNodeScale) {
Show white space 24 line context
... ...
@@ -15,29 +15,34 @@
15 15
 * purpose.
16 16
 *
17 17
 */
18 18

	
19 19
#ifndef LEMON_TIME_MEASURE_H
20 20
#define LEMON_TIME_MEASURE_H
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>
38 43
#include <iostream>
39 44

	
40 45
namespace lemon {
41 46

	
42 47
  /// \addtogroup timecount
43 48
  /// @{
0 comments (0 inline)