Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Experimental/mapbox variant #1104

Merged
merged 15 commits into from
Aug 14, 2014
+903 −61
Merged

Experimental/mapbox variant #1104

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7d2c627
replace boost::variant w/ mapbox::util::variant
DennisOSRM Jun 26, 2014
e2794e9
initial checkin of mapbox::util::variant
DennisOSRM Jun 26, 2014
4c3cb76
remove remnants of boost::variant
DennisOSRM Jun 26, 2014
4a1a10f
use Nov 2013 CTP to build
DennisOSRM Jun 26, 2014
1bfd9ab
replace nmake by msbuild
DennisOSRM Jun 26, 2014
e10f36d
use explicit OSRM.sln filename
DennisOSRM Jun 26, 2014
7e3f476
use 64bit cmake generator
DennisOSRM Jun 27, 2014
eda8f4c
make integer literals static const instead of constexpr
DennisOSRM Jun 27, 2014
d6b2712
make msbuild less verbose
DennisOSRM Jun 27, 2014
1de7360
make canary static const instead of constexpr
DennisOSRM Jun 27, 2014
a5e99a9
remove constexpr workaround as minimum req. is now Nov 2013 CTP
DennisOSRM Jun 27, 2014
cdd72c7
fast forward variant lib
DennisOSRM Jul 8, 2014
074e1e9
build test target explicitly on AppVeyor
DennisOSRM Jul 23, 2014
ffa0ace
build tests by running msbuild on tests project file
DennisOSRM Jul 23, 2014
27a367c
enter build directory before calling tests
DennisOSRM Jul 23, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
remove remnants of boost::variant
@DennisOSRM
DennisOSRM committed Aug 14, 2014

Verified

This commit was signed with the committer’s verified signature.
lucasssvaz Lucas Saavedra Vaz
GPG key ID: 9CAE85DC84A38188
Verified
Learn about vigilant mode
commit 4c3cb76cedaa11209113711b47c0d213459db91c
8 changes: 0 additions & 8 deletions DataStructures/JSONContainer.h
View file
Original file line number Diff line number Diff line change
@@ -33,8 +33,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../ThirdParty/variant/variant.hpp"
#include "../Util/StringUtil.h"

// #include <boost/variant.hpp>

#include <iostream>
#include <vector>
#include <string>
@@ -43,14 +41,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace JSON
{

// struct String;
// struct Number;
struct Object;
struct Array;
// struct True;
// struct False;
// struct Null;


struct String
{
16 changes: 0 additions & 16 deletions DataStructures/StaticRTree.h
View file
Original file line number Diff line number Diff line change
@@ -49,7 +49,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/thread.hpp>
// #include <boost/variant.hpp>

#include <tbb/parallel_for.h>
#include <tbb/parallel_sort.h>
@@ -324,23 +323,8 @@ class StaticRTree
return other.min_dist < min_dist;
}

// inline bool RepresentsTreeNode() const
// {
// return mapbox::util::apply_visitor(decide_type_visitor(), node);
// }

float min_dist;
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;