diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 09:39:45 +0300 |
commit | 4cd7979c56130194cc3742e1037998d11f98c047 (patch) | |
tree | 70131981da1d874d68b9e8cc8e7bf293e405907e /storage/oqgraph | |
parent | 619dc2b24f26aea29345dc3f3289bed406738025 (diff) | |
parent | 9c34a4124d67d9e3f70837eaeb11290f35e8f8d0 (diff) | |
download | mariadb-git-4cd7979c56130194cc3742e1037998d11f98c047.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/oqgraph')
-rw-r--r-- | storage/oqgraph/graphcore-config.h | 2 | ||||
-rw-r--r-- | storage/oqgraph/oqgraph_shim.h | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/storage/oqgraph/graphcore-config.h b/storage/oqgraph/graphcore-config.h index 2afb7dfbcd6..3ef9da152ad 100644 --- a/storage/oqgraph/graphcore-config.h +++ b/storage/oqgraph/graphcore-config.h @@ -27,6 +27,8 @@ #define BOOST_ALL_NO_LIB 1 #define BOOST_NO_RTTI 1 #define BOOST_NO_TYPEID 1 +#define BOOST_NO_HASH 1 +#define BOOST_NO_SLIST 1 #ifdef DBUG_OFF #define NDEBUG 1 diff --git a/storage/oqgraph/oqgraph_shim.h b/storage/oqgraph/oqgraph_shim.h index df578c9e4d0..aab6e797306 100644 --- a/storage/oqgraph/oqgraph_shim.h +++ b/storage/oqgraph/oqgraph_shim.h @@ -27,9 +27,6 @@ #include "oqgraph_judy.h" #include "oqgraph_thunk.h" -#define BOOST_NO_HASH 1 -#define BOOST_NO_SLIST 1 - #include <boost/graph/directed_graph.hpp> #include <boost/graph/adjacency_iterator.hpp> |