diff --git a/include/mapnik/mapped_memory_cache.hpp b/include/mapnik/mapped_memory_cache.hpp index 34151b2b6..2526e5855 100644 --- a/include/mapnik/mapped_memory_cache.hpp +++ b/include/mapnik/mapped_memory_cache.hpp @@ -30,16 +30,14 @@ // boost #include -#include #include #include +#include namespace mapnik { -using namespace boost::interprocess; - -typedef boost::shared_ptr mapped_region_ptr; +typedef boost::shared_ptr mapped_region_ptr; class MAPNIK_DECL mapped_memory_cache : public singleton, diff --git a/plugins/input/ogr/ogr_index_featureset.cpp b/plugins/input/ogr/ogr_index_featureset.cpp index 1f6c62939..3108cc152 100644 --- a/plugins/input/ogr/ogr_index_featureset.cpp +++ b/plugins/input/ogr/ogr_index_featureset.cpp @@ -34,6 +34,7 @@ #include // boost +#include #include // ogr diff --git a/plugins/input/shape/dbfile.cpp b/plugins/input/shape/dbfile.cpp index f30d54374..9d32c35b8 100644 --- a/plugins/input/shape/dbfile.cpp +++ b/plugins/input/shape/dbfile.cpp @@ -32,6 +32,7 @@ #include #include // for int16_t and int32_t #ifdef SHAPE_MEMORY_MAPPED_FILE +#include #include #endif diff --git a/plugins/input/shape/shape_index_featureset.cpp b/plugins/input/shape/shape_index_featureset.cpp index 20d4bd181..6c1b0f46b 100644 --- a/plugins/input/shape/shape_index_featureset.cpp +++ b/plugins/input/shape/shape_index_featureset.cpp @@ -29,7 +29,9 @@ // boost #include +#ifdef SHAPE_MEMORY_MAPPED_FILE #include +#endif #include #include "shape_index_featureset.hpp" diff --git a/plugins/input/shape/shapefile.hpp b/plugins/input/shape/shapefile.hpp index 019b52018..b615d1f37 100644 --- a/plugins/input/shape/shapefile.hpp +++ b/plugins/input/shape/shapefile.hpp @@ -34,6 +34,7 @@ #include #include #ifdef SHAPE_MEMORY_MAPPED_FILE +#include #include #endif #include diff --git a/src/mapped_memory_cache.cpp b/src/mapped_memory_cache.cpp index eb109a1f3..8a933730c 100644 --- a/src/mapped_memory_cache.cpp +++ b/src/mapped_memory_cache.cpp @@ -27,6 +27,7 @@ // boost #include +#include #include #include @@ -67,8 +68,8 @@ boost::optional mapped_memory_cache::find(std::string const& { try { - file_mapping mapping(uri.c_str(),read_only); - mapped_region_ptr region(boost::make_shared(mapping,read_only)); + boost::interprocess::file_mapping mapping(uri.c_str(),boost::interprocess::read_only); + mapped_region_ptr region(boost::make_shared(mapping,boost::interprocess::read_only)); result.reset(region);