Commit 400a8eb6 authored by Sergey Vojtovich's avatar Sergey Vojtovich

MDEV-15291 - OQGraph fails to build on FreeBSD

Boost includes sys/param.h on FreeBSD, which in turn defines setbit()
macro. This macro is conflicting with open_query::judy_bitset::setbit().

Reordered includes such that oqgraph_judy.h never sees this macro.
Also removed duplicate includes of graphcore-config.h, which is included
by graphcore-graph.h/oqgraph_shim.h/oqgraph_thunk.h.
parent 89011557
...@@ -22,6 +22,5 @@ ...@@ -22,6 +22,5 @@
====================================================================== ======================================================================
*/ */
#include "graphcore-config.h"
#include "graphcore-graph.h" #include "graphcore-graph.h"
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
#include <string.h> #include <string.h>
#include <cstdlib> #include <cstdlib>
#include "graphcore-config.h"
#include "graphcore-graph.h" #include "graphcore-graph.h"
#include <set> #include <set>
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
#pragma once #pragma once
#include "oqgraph_thunk.h"
#include "oqgraph_judy.h" #include "oqgraph_judy.h"
#include "oqgraph_thunk.h"
#define BOOST_NO_HASH 1 #define BOOST_NO_HASH 1
#define BOOST_NO_SLIST 1 #define BOOST_NO_SLIST 1
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment