MDEV-15510 - storage/oqgraph: Quench warnings with Boost 1.66

Moved Boost configuration definitions before first inclusion of Boost headers to avoid re-definition.
MariaDB · Apr 11, 2018 · 226ec99 · 226ec99
1 parent 400a8eb
commit 226ec99
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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>