COIN-OR::LEMON - Graph Library

Changeset 509:c5919679af17 in lemon-1.2


Ignore:
Timestamp:
02/10/09 18:37:59 (11 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Parents:
508:861a9d5ff283 (diff), 481: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
Message:

Merge

Location:
lemon
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • lemon/graph_to_eps.h

    r481 r509  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2008
     5 * Copyright (C) 2003-2009
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
  • lemon/graph_to_eps.h

    r440 r509  
    3030#include<ctime>
    3131#else
     32#ifndef WIN32_LEAN_AND_MEAN
    3233#define WIN32_LEAN_AND_MEAN
     34#endif
     35#ifndef NOMINMAX
    3336#define NOMINMAX
     37#endif
    3438#include<windows.h>
    3539#endif
     
    689693#else
    690694      SYSTEMTIME time;
    691       char buf1[11], buf2[9], buf3[5];
    692 
    693695      GetSystemTime(&time);
     696#if defined(_MSC_VER) && (_MSC_VER < 1500)
     697      LPWSTR buf1, buf2, buf3;
    694698      if (GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
    695                         "ddd MMM dd", buf1, 11) &&
     699                        L"ddd MMM dd", buf1, 11) &&
    696700          GetTimeFormat(LOCALE_USER_DEFAULT, 0, &time,
    697                         "HH':'mm':'ss", buf2, 9) &&
     701                        L"HH':'mm':'ss", buf2, 9) &&
    698702          GetDateFormat(LOCALE_USER_DEFAULT, 0, &time,
    699                                 "yyyy", buf3, 5)) {
     703                        L"yyyy", buf3, 5)) {
    700704        os << "%%CreationDate: " << buf1 << ' '
    701705           << buf2 << ' ' << buf3 << std::endl;
    702706      }
     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
    703719#endif
    704720    }
  • lemon/time_measure.h

    r481 r509  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2008
     5 * Copyright (C) 2003-2009
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
  • lemon/time_measure.h

    r440 r509  
    2525
    2626#ifdef WIN32
     27#ifndef WIN32_LEAN_AND_MEAN
    2728#define WIN32_LEAN_AND_MEAN
     29#endif
     30#ifndef NOMINMAX
    2831#define NOMINMAX
     32#endif
    2933#include <windows.h>
    3034#include <cmath>
    3135#else
     36#include <unistd.h>
    3237#include <sys/times.h>
    3338#include <sys/time.h>
Note: See TracChangeset for help on using the changeset viewer.