fix include order and ensure mapnik/config.hpp is before boost_shim_..
This commit is contained in:
parent
82142a54cc
commit
b38dc14188
20 changed files with 33 additions and 2 deletions
|
@ -19,7 +19,7 @@
|
||||||
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
|
|
@ -20,17 +20,21 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
#include <boost/python.hpp>
|
||||||
#include <boost/python/iterator.hpp>
|
#include <boost/python/iterator.hpp>
|
||||||
#include <boost/python/call_method.hpp>
|
#include <boost/python/call_method.hpp>
|
||||||
#include <boost/python/tuple.hpp>
|
#include <boost/python/tuple.hpp>
|
||||||
#include <boost/python/to_python_converter.hpp>
|
#include <boost/python/to_python_converter.hpp>
|
||||||
#include <boost/python.hpp>
|
|
||||||
#include <boost/noncopyable.hpp>
|
#include <boost/noncopyable.hpp>
|
||||||
|
|
||||||
// mapnik
|
// mapnik
|
||||||
|
|
||||||
#include <mapnik/value_types.hpp>
|
#include <mapnik/value_types.hpp>
|
||||||
#include <mapnik/feature.hpp>
|
#include <mapnik/feature.hpp>
|
||||||
#include <mapnik/feature_factory.hpp>
|
#include <mapnik/feature_factory.hpp>
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
#if defined(GRID_RENDERER)
|
#if defined(GRID_RENDERER)
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include <mapnik/config.hpp>
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
// boost
|
// boost
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
|
@ -20,6 +20,8 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
*
|
*
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
|
#include <mapnik/config.hpp>
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// mapnik
|
// mapnik
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include <mapnik/config.hpp>
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
#include "python_to_value.hpp"
|
#include "python_to_value.hpp"
|
||||||
#include <boost/python/args.hpp> // for keywords, arg, etc
|
#include <boost/python/args.hpp> // for keywords, arg, etc
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include <mapnik/config.hpp>
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
// boost
|
// boost
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include <mapnik/config.hpp>
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
// boost
|
// boost
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
*****************************************************************************/
|
*****************************************************************************/
|
||||||
|
|
||||||
#include <mapnik/config.hpp>
|
#include <mapnik/config.hpp>
|
||||||
|
|
||||||
#include "boost_std_shared_shim.hpp"
|
#include "boost_std_shared_shim.hpp"
|
||||||
|
|
||||||
#include <boost/python.hpp>
|
#include <boost/python.hpp>
|
||||||
|
|
Loading…
Reference in a new issue