Merge branch 'master' into issue-3242
This commit is contained in:
commit
e5e36fc3ce
1 changed files with 0 additions and 2 deletions
|
@ -24,7 +24,6 @@
|
|||
#define MAPNIK_UTIL_CHAR_ARRAY_BUFFER_HPP
|
||||
|
||||
#include <streambuf>
|
||||
#include <iostream>
|
||||
|
||||
namespace mapnik { namespace util {
|
||||
|
||||
|
@ -57,7 +56,6 @@ private:
|
|||
|
||||
int_type pbackfail(int_type ch)
|
||||
{
|
||||
std::cerr << "pbackfail" << std::endl;
|
||||
if (current_ == begin_ || (ch != traits_type::eof() && ch != current_[-1]))
|
||||
{
|
||||
return traits_type::eof();
|
||||
|
|
Loading…
Reference in a new issue