COIN-OR::LEMON - Graph Library

Changeset 914:60f4aaedb20f in lemon-1.2 for lemon


Ignore:
Timestamp:
04/12/11 07:52:25 (8 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
1.2
Parents:
912:cc9bb4f95ed3 (diff), 913:64260c0f58eb (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 #418 to branch 1.2

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/bits/windows.cc

    r877 r914  
    4141#include <unistd.h>
    4242#include <ctime>
     43#ifndef WIN32
    4344#include <sys/times.h>
     45#endif
    4446#include <sys/time.h>
    4547#endif
  • lemon/bits/windows.cc

    r913 r914  
    33 * This file is a part of LEMON, a generic C++ optimization library.
    44 *
    5  * Copyright (C) 2003-2009
     5 * Copyright (C) 2003-2010
    66 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
    77 * (Egervary Research Group on Combinatorial Optimization, EGRES).
     
    9999      GetSystemTime(&time);
    100100      char buf1[11], buf2[9], buf3[5];
    101           if (GetDateFormat(MY_LOCALE, 0, &time,
     101          if (GetDateFormat(MY_LOCALE, 0, &time,
    102102                        ("ddd MMM dd"), buf1, 11) &&
    103103          GetTimeFormat(MY_LOCALE, 0, &time,
Note: See TracChangeset for help on using the changeset viewer.