sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into issue-3242

Browse source
This commit is contained in:
artemp 2016-06-22 17:35:48 +01:00
commit e5e36fc3ce
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/util/char_array_buffer.hpp
View file

@ -24,7 +24,6 @@
#define MAPNIK_UTIL_CHAR_ARRAY_BUFFER_HPP #define MAPNIK_UTIL_CHAR_ARRAY_BUFFER_HPP
#include <streambuf> #include <streambuf>
#include <iostream>
namespace mapnik { namespace util { namespace mapnik { namespace util {
@ -57,7 +56,6 @@ private:
int_type pbackfail(int_type ch) int_type pbackfail(int_type ch)
{ {
std::cerr << "pbackfail" << std::endl;
if (current_ == begin_ || (ch != traits_type::eof() && ch != current_[-1])) if (current_ == begin_ || (ch != traits_type::eof() && ch != current_[-1]))
{ {
return traits_type::eof(); return traits_type::eof();