Changes from tags/0.6.1 at r4334 to tags/0.6.2 at r4334

Location:

tags/0.6.2

Files:

• NEWS (modified) (1 diff)
• m4/version.m4 (modified) (2 diffs)
• yat/utility/merge.h (modified) (2 diffs)

tags/0.6.2/NEWS

@@ -4 +4 @@
 
 yat 0.6.x series from http://dev.thep.lu.se/yat/svn/branches/0.6-stable
+
+Version 0.6.2 (released 18 May 2010)
+
+  - fixed bug with merge when result is weighted (r2251)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/yat/query?status=closed&milestone=yat+0.6.2
 
 Version 0.6.1 (released 14 March 2010)

tags/0.6.2/m4/version.m4

@@ -28 +28 @@
 m4_define([MINOR_VERSION], [6])
 # PATCH - Modify for every released patch
-m4_define([PATCH_VERSION], [1])
+m4_define([PATCH_VERSION], [2])
 
 # DEV_BUILD - When rolling a tarball we set this to `false'. In
@@ -63 +63 @@
 # yat-0.6.0  3:0:0
 # yat-0.6.1  3:1:0
+# yat-0.6.2  3:2:0
 #
 # *Accidently, the libtool number was not updated for yat 0.5
 #
-m4_define([YAT_LT_VERSION_INFO], [3:1:0])
+m4_define([YAT_LT_VERSION_INFO], [3:2:0])
 
 ###

tags/0.6.2/yat/utility/merge.h

@@ -5 +5 @@
 
 /*
-  Copyright (C) 2009 Peter Johansson
+  Copyright (C) 2009, 2010 Peter Johansson
 
   This file is part of the yat library, http://dev.thep.lu.se/yat
@@ -187 +187 @@
     template<typename Iterator, class Functor1, class Functor2>
     void assign(DataWeight& x, Iterator first, Iterator last, Functor1 func1,
-                Functor2 func)
+                Functor2 func2)
     {
       x.data() = func1(first, last);