Using std::copy_if for CharacterSet::operator +=

diff --git a/src/base/CharacterSet.cc b/src/base/CharacterSet.cc
index 3df5f3eee7ffb0c768cfe7e87799a789ee6d9d22..697276aed2445474ed5f460af807bc89aa3b3f58 100644 (file)
--- a/src/base/CharacterSet.cc
+++ b/src/base/CharacterSet.cc
@@ -2,18 +2,17 @@
 
 #include "CharacterSet.h"
 
+#include <algorithm>
+
+static bool
+isNonZero(uint8_t i) {
+    return i!=0;
+}
+
 const CharacterSet &
 CharacterSet::operator +=(const CharacterSet &src)
 {
-    vector_type::const_iterator s = src.chars_.begin();
-    const vector_type::const_iterator e = src.chars_.end();
-    vector_type::iterator d = chars_.begin();
-    while (s != e) {
-        if (*s)
-            *d = 1;
-        ++s;
-        ++d;
-    }
+    std::copy_if(src.chars_.begin(),src.chars_.end(),chars_.begin(),isNonZero);
     return *this;
 }