Changeset 478 for branches/0.6-stable

Timestamp:

Sep 11, 2007, 10:19:46 PM (16 years ago)

Author:

Jari Häkkinen

Message:

Fixes #267. Also added some missing std:: qualifiers.

File:

• branches/0.6-stable/lib/utility.h (modified) (1 diff)

branches/0.6-stable/lib/utility.h

@@ -308 +308 @@
       if ( u.size() > v.size() ){
         std::vector<T> res(u.size());
-        transform(u.begin(), u.end(), v.begin(), res.begin(), std::plus<T>());
-        copy(u.begin()+v.size(), u.end(), res.begin()+v.size());
+        std::transform(v.begin(), v.end(), u.begin(), res.begin(),
+                       std::plus<T>());
+        std::copy(u.begin()+v.size(), u.end(), res.begin()+v.size());
         return res;
       }
-  
       std::vector<T> res(v.size());
-      transform(v.begin(), v.end(), u.begin(), res.begin(), std::plus<T>());
-      if ( v.size() > u.size() )
-        copy(v.begin()+u.size(), v.end(), res.begin()+u.size());
+      std::transform(u.begin(), u.end(), v.begin(), res.begin(), std::plus<T>());
+      std::copy(v.begin()+u.size(), v.end(), res.begin()+u.size());
       return res;
     }
-
   };