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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
artemp 2015-06-02 15:39:35 +01:00
commit 8e1e5f19d1
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@
#include <mapnik/util/singleton.hpp>
#include <mapnik/make_unique.hpp>
#include <mapnik/util/noncopyable.hpp>
//#include <mapnik/config.hpp>
#include <mapnik/util/utf_conv_win.hpp>
// stl
#include <cstdio>

1
src/rapidxml_loader.cpp
View file

@ -32,6 +32,7 @@
#include <mapnik/xml_node.hpp>
#include <mapnik/util/trim.hpp>
#include <mapnik/util/noncopyable.hpp>
#include <mapnik/util/utf_conv_win.hpp>
// stl
#include <iostream>