remove remnants of boost::variant
This commit is contained in:
parent
e2794e9f06
commit
4c3cb76ced
@ -33,8 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include "../ThirdParty/variant/variant.hpp"
|
#include "../ThirdParty/variant/variant.hpp"
|
||||||
#include "../Util/StringUtil.h"
|
#include "../Util/StringUtil.h"
|
||||||
|
|
||||||
// #include <boost/variant.hpp>
|
|
||||||
|
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <string>
|
#include <string>
|
||||||
@ -43,14 +41,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
namespace JSON
|
namespace JSON
|
||||||
{
|
{
|
||||||
|
|
||||||
// struct String;
|
|
||||||
// struct Number;
|
|
||||||
struct Object;
|
struct Object;
|
||||||
struct Array;
|
struct Array;
|
||||||
// struct True;
|
|
||||||
// struct False;
|
|
||||||
// struct Null;
|
|
||||||
|
|
||||||
|
|
||||||
struct String
|
struct String
|
||||||
{
|
{
|
||||||
|
@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||||||
#include <boost/filesystem.hpp>
|
#include <boost/filesystem.hpp>
|
||||||
#include <boost/filesystem/fstream.hpp>
|
#include <boost/filesystem/fstream.hpp>
|
||||||
#include <boost/thread.hpp>
|
#include <boost/thread.hpp>
|
||||||
// #include <boost/variant.hpp>
|
|
||||||
|
|
||||||
#include <tbb/parallel_for.h>
|
#include <tbb/parallel_for.h>
|
||||||
#include <tbb/parallel_sort.h>
|
#include <tbb/parallel_sort.h>
|
||||||
@ -324,23 +323,8 @@ class StaticRTree
|
|||||||
return other.min_dist < min_dist;
|
return other.min_dist < min_dist;
|
||||||
}
|
}
|
||||||
|
|
||||||
// inline bool RepresentsTreeNode() const
|
|
||||||
// {
|
|
||||||
// return mapbox::util::apply_visitor(decide_type_visitor(), node);
|
|
||||||
// }
|
|
||||||
|
|
||||||
float min_dist;
|
float min_dist;
|
||||||
IncrementalQueryNodeType node;
|
IncrementalQueryNodeType node;
|
||||||
|
|
||||||
// private:
|
|
||||||
// class decide_type_visitor : public mapbox::util::static_visitor<bool>
|
|
||||||
// {
|
|
||||||
// public:
|
|
||||||
// bool operator()(const TreeNode &) const { return true; }
|
|
||||||
|
|
||||||
// template<typename AnotherType>
|
|
||||||
// bool operator()(const AnotherType &) const { return false; }
|
|
||||||
// };
|
|
||||||
};
|
};
|
||||||
|
|
||||||
typename ShM<TreeNode, UseSharedMemory>::vector m_search_tree;
|
typename ShM<TreeNode, UseSharedMemory>::vector m_search_tree;
|
||||||
|
Loading…
Reference in New Issue
Block a user