Changeset 548:94387da47f79 in lemon-main

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:

• lemon/time_measure.h (modified) (1 diff)
• lemon/time_measure.h (modified) (1 diff)

lemon/time_measure.h

@@ -3 +3 @@
  * This file is a part of LEMON, a generic C++ optimization library.
  *
- * Copyright (C) 2003-2008
+ * Copyright (C) 2003-2009
  * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
  * (Egervary Research Group on Combinatorial Optimization, EGRES).

lemon/time_measure.h

@@ -203 +203 @@
   };
 
-  TimeStamp operator*(double b,const TimeStamp &t)
+  inline TimeStamp operator*(double b,const TimeStamp &t)
   {
     return t*b;