mirror of
https://github.com/opencv/opencv.git
synced 2025-07-26 07:07:37 +08:00
dnn: force visibility(default) for IE headers
This commit is contained in:
parent
62d079fa69
commit
c667de9b68
@ -15,14 +15,6 @@
|
|||||||
#include "opencv2/dnn/utils/inference_engine.hpp"
|
#include "opencv2/dnn/utils/inference_engine.hpp"
|
||||||
|
|
||||||
#ifdef HAVE_INF_ENGINE
|
#ifdef HAVE_INF_ENGINE
|
||||||
#if defined(__GNUC__) && __GNUC__ >= 5
|
|
||||||
//#pragma GCC diagnostic push
|
|
||||||
#pragma GCC diagnostic ignored "-Wsuggest-override"
|
|
||||||
#endif
|
|
||||||
#include <inference_engine.hpp>
|
|
||||||
#if defined(__GNUC__) && __GNUC__ >= 5
|
|
||||||
//#pragma GCC diagnostic pop
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define INF_ENGINE_RELEASE_2018R3 2018030000
|
#define INF_ENGINE_RELEASE_2018R3 2018030000
|
||||||
#define INF_ENGINE_RELEASE_2018R4 2018040000
|
#define INF_ENGINE_RELEASE_2018R4 2018040000
|
||||||
@ -37,12 +29,32 @@
|
|||||||
#define INF_ENGINE_VER_MAJOR_GT(ver) (((INF_ENGINE_RELEASE) / 10000) > ((ver) / 10000))
|
#define INF_ENGINE_VER_MAJOR_GT(ver) (((INF_ENGINE_RELEASE) / 10000) > ((ver) / 10000))
|
||||||
#define INF_ENGINE_VER_MAJOR_GE(ver) (((INF_ENGINE_RELEASE) / 10000) >= ((ver) / 10000))
|
#define INF_ENGINE_VER_MAJOR_GE(ver) (((INF_ENGINE_RELEASE) / 10000) >= ((ver) / 10000))
|
||||||
#define INF_ENGINE_VER_MAJOR_LT(ver) (((INF_ENGINE_RELEASE) / 10000) < ((ver) / 10000))
|
#define INF_ENGINE_VER_MAJOR_LT(ver) (((INF_ENGINE_RELEASE) / 10000) < ((ver) / 10000))
|
||||||
|
#define INF_ENGINE_VER_MAJOR_LE(ver) (((INF_ENGINE_RELEASE) / 10000) <= ((ver) / 10000))
|
||||||
#define INF_ENGINE_VER_MAJOR_EQ(ver) (((INF_ENGINE_RELEASE) / 10000) == ((ver) / 10000))
|
#define INF_ENGINE_VER_MAJOR_EQ(ver) (((INF_ENGINE_RELEASE) / 10000) == ((ver) / 10000))
|
||||||
|
|
||||||
|
#if defined(__GNUC__) && __GNUC__ >= 5
|
||||||
|
//#pragma GCC diagnostic push
|
||||||
|
#pragma GCC diagnostic ignored "-Wsuggest-override"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GNUC__) && INF_ENGINE_VER_MAJOR_LE(INF_ENGINE_RELEASE_2019R1)
|
||||||
|
#pragma GCC visibility push(default)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <inference_engine.hpp>
|
||||||
|
|
||||||
#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2018R5)
|
#if INF_ENGINE_VER_MAJOR_GE(INF_ENGINE_RELEASE_2018R5)
|
||||||
#include <ie_builders.hpp>
|
#include <ie_builders.hpp>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GNUC__) && INF_ENGINE_VER_MAJOR_LE(INF_ENGINE_RELEASE_2019R1)
|
||||||
|
#pragma GCC visibility pop
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__GNUC__) && __GNUC__ >= 5
|
||||||
|
//#pragma GCC diagnostic pop
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // HAVE_INF_ENGINE
|
#endif // HAVE_INF_ENGINE
|
||||||
|
|
||||||
namespace cv { namespace dnn {
|
namespace cv { namespace dnn {
|
||||||
|
Loading…
Reference in New Issue
Block a user