COIN-OR::LEMON - Graph Library

Changeset 556:c5919679af17 in lemon for lemon/time_measure.h


Ignore:
Timestamp:
02/10/09 18:37:59 (11 years ago)
Author:
Alpar Juttner <alpar@…>
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
Message:

Merge

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lemon/time_measure.h

    r509 r556  
    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

    r463 r556  
    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.