Merge branch 'master' into Edits
This commit is contained in:
@@ -21,6 +21,9 @@
|
||||
****************************************************************************/
|
||||
#include "PreCompiled.h"
|
||||
|
||||
// From Boost 1.75 on the geometry component requires C++14
|
||||
#define BOOST_GEOMETRY_DISABLE_DEPRECATED_03_WARNING
|
||||
|
||||
#ifndef _PreComp_
|
||||
# include <cfloat>
|
||||
# include <boost/version.hpp>
|
||||
|
||||
@@ -30,8 +30,10 @@
|
||||
#pragma implementation
|
||||
#endif
|
||||
|
||||
#include <boost/progress.hpp>
|
||||
#include <boost/timer.hpp>
|
||||
#define BOOST_BIND_GLOBAL_PLACEHOLDERS
|
||||
|
||||
//#include <boost/progress.hpp>
|
||||
//#include <boost/timer.hpp>
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/python.hpp>
|
||||
#include <boost/python/module.hpp>
|
||||
|
||||
Reference in New Issue
Block a user