Changeset 556:c5919679af17 in lemon
- Timestamp:
- 02/10/09 18:37:59 (16 years ago)
- Branch:
- default
- Parents:
- 555:861a9d5ff283 (diff), 509:daddd623ac9a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent. - Phase:
- public
- Location:
- lemon
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
lemon/graph_to_eps.h
r509 r556 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-200 85 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/graph_to_eps.h
r463 r556 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 … … 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 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 } -
lemon/time_measure.h
r509 r556 3 3 * This file is a part of LEMON, a generic C++ optimization library. 4 4 * 5 * Copyright (C) 2003-200 85 * Copyright (C) 2003-2009 6 6 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport 7 7 * (Egervary Research Group on Combinatorial Optimization, EGRES). -
lemon/time_measure.h
r463 r556 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>
Note: See TracChangeset
for help on using the changeset viewer.