Merge [672] (gcc 4.3 build fixes)
This commit is contained in:
parent
baae6d7128
commit
87044ce5d6
6 changed files with 7 additions and 0 deletions
|
@ -17,6 +17,7 @@
|
|||
#include <stdexcept>
|
||||
#include <functional> // for std::less
|
||||
#include <memory> // for std::auto_ptr
|
||||
#include <typeinfo>
|
||||
#include <boost/assert.hpp>
|
||||
#include <boost/static_assert.hpp>
|
||||
#include <boost/type_traits.hpp>
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include <vector>
|
||||
#include <bitset>
|
||||
#include <iostream>
|
||||
#include <cstdlib>
|
||||
|
||||
namespace mapnik {
|
||||
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
|
||||
#include <mapnik/octree.hpp>
|
||||
#include <cassert>
|
||||
#include <cstring>
|
||||
|
||||
// When using Sun's C++ compiler, use the `std` namespace to get memcpy, memset routines.
|
||||
#ifdef __SUNPRO_CC
|
||||
|
|
|
@ -30,6 +30,7 @@
|
|||
#include <boost/noncopyable.hpp>
|
||||
// stl
|
||||
#include <vector>
|
||||
#include <cstring>
|
||||
|
||||
namespace mapnik
|
||||
{
|
||||
|
|
|
@ -37,6 +37,7 @@
|
|||
#include <boost/tuple/tuple.hpp>
|
||||
// stl
|
||||
#include <vector>
|
||||
#include <cstring>
|
||||
|
||||
namespace mapnik
|
||||
{
|
||||
|
|
|
@ -32,6 +32,8 @@
|
|||
#include <boost/iostreams/device/file.hpp>
|
||||
#include <boost/iostreams/device/mapped_file.hpp>
|
||||
|
||||
#include <cstring>
|
||||
|
||||
using mapnik::Envelope;
|
||||
|
||||
struct shape_record
|
||||
|
|
Loading…
Reference in a new issue