COIN-OR::LEMON - Graph Library

Changeset 548:94387da47f79 in lemon-main


Ignore:
Timestamp:
03/05/09 11:13:20 (16 years ago)
Author:
Alpar Juttner <alpar@…>
Branch:
default
Children:
549:ba659d676331, 559:c5fd2d996909
Parents:
547:d59dcc933e59 (diff), 505:097d7c4634ea (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

    r505 r548  
    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

    r492 r548  
    203203  };
    204204
    205   TimeStamp operator*(double b,const TimeStamp &t)
     205  inline TimeStamp operator*(double b,const TimeStamp &t)
    206206  {
    207207    return t*b;
Note: See TracChangeset for help on using the changeset viewer.