Don't count lines in iostreams counter filter

Author: arahlin

core/src/counter64.hpp

@@ -5,7 +5,7 @@
 
 // See http://www.boost.org/libs/iostreams for documentation.
 
-// Same as counter.hpp, but 64-bit
+// Same as counter.hpp, but 64-bit and no line counter
 
 #ifndef BOOST_IOSTREAMS_COUNTER64_HPP_INCLUDED
 #define BOOST_IOSTREAMS_COUNTER64_HPP_INCLUDED
@@ -14,9 +14,7 @@
 # pragma once
 #endif
 
-#include <algorithm>  // count.
 #include <boost/iostreams/categories.hpp>
-#include <boost/iostreams/char_traits.hpp>
 #include <boost/iostreams/operations.hpp>
 #include <boost/iostreams/pipeline.hpp>
 
@@ -29,7 +27,7 @@ namespace boost { namespace iostreams {
 // Template name: basic_counter.
 // Template parameters:
 //      Ch - The character type.
-// Description: Filter which counts lines and characters.
+// Description: Filter which counts characters.
 //
 template<typename Ch>
 class basic_counter64  {
@@ -41,10 +39,9 @@ class basic_counter64  {
           multichar_tag,
           optimally_buffered_tag
         { };
-    explicit basic_counter64(int64_t first_line = 0, int64_t first_char = 0)
-        : lines_(first_line), chars_(first_char)
+    explicit basic_counter64(int64_t first_char = 0)
+        : chars_(first_char)
         { }
-    int64_t lines() const { return lines_; }
     int64_t characters() const { return chars_; }
     std::streamsize optimal_buffer_size() const { return 0; }
 
@@ -54,7 +51,6 @@ class basic_counter64  {
         std::streamsize result = iostreams::read(src, s, n);
         if (result == -1)
             return -1;
-        lines_ += std::count(s, s + result, char_traits<Ch>::newline());
         chars_ += result;
         return result;
     }
@@ -63,12 +59,10 @@ class basic_counter64  {
     std::streamsize write(Sink& snk, const char_type* s, std::streamsize n)
     {
         std::streamsize result = iostreams::write(snk, s, n);
-        lines_ += std::count(s, s + result, char_traits<Ch>::newline());
         chars_ += result;
         return result;
     }
 private:
-    int64_t lines_;
     int64_t chars_;
 };
 BOOST_IOSTREAMS_PIPABLE(basic_counter64, 1)