diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2018-04-11 14:22:10 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2018-04-11 14:22:10 +0400 |
| commit | 226ec99a3ed662bace80d70dd7fefd0db7b4af0a (patch) | |
| tree | a5ae958c5db296b536af055422422a85a4a83486 /storage/oqgraph | |
| parent | 400a8eb60f832030a04a248e2c96552aa3f44055 (diff) | |
| download | mariadb-git-226ec99a3ed662bace80d70dd7fefd0db7b4af0a.tar.gz | |
MDEV-15510 - storage/oqgraph: Quench warnings with Boost 1.66
Moved Boost configuration definitions before first inclusion of Boost
headers to avoid re-definition.
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 d5656bddf78..caee39f8c30 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 d3e7d044e86..1c83e52ea30 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> |