From e7d762ef31d95f8a7bd0375fa65fbf26be9ce00f Mon Sep 17 00:00:00 2001
From: wangguibao <wangguibao@baidu.com>
Date: Sat, 14 Dec 2019 16:23:14 +0800
Subject: [PATCH] Fix build issue with GCC8.2

---
 demo-serving/op/classify_op.h                   | 8 --------
 demo-serving/op/ctr_prediction_op.h             | 8 --------
 demo-serving/op/reader_op.h                     | 9 ---------
 demo-serving/op/text_classification_op.h        | 8 --------
 inferencer-fluid-cpu/include/fluid_cpu_engine.h | 8 --------
 inferencer-fluid-gpu/include/fluid_gpu_engine.h | 8 --------
 kvdb/include/kvdb/kvdb_impl.h                   | 1 +
 7 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/demo-serving/op/classify_op.h b/demo-serving/op/classify_op.h
index c381f032..a4b11564 100644
--- a/demo-serving/op/classify_op.h
+++ b/demo-serving/op/classify_op.h
@@ -14,15 +14,7 @@
 
 #pragma once
 #include <vector>
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "demo-serving/image_class.pb.h"
 
 namespace baidu {
diff --git a/demo-serving/op/ctr_prediction_op.h b/demo-serving/op/ctr_prediction_op.h
index ee648151..c135de38 100644
--- a/demo-serving/op/ctr_prediction_op.h
+++ b/demo-serving/op/ctr_prediction_op.h
@@ -14,15 +14,7 @@
 
 #pragma once
 #include <vector>
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "demo-serving/ctr_prediction.pb.h"
 
 namespace baidu {
diff --git a/demo-serving/op/reader_op.h b/demo-serving/op/reader_op.h
index 546ca196..e3a63fcd 100644
--- a/demo-serving/op/reader_op.h
+++ b/demo-serving/op/reader_op.h
@@ -27,16 +27,7 @@
 #include "opencv/cv.hpp"
 #include "opencv/cxcore.h"
 #include "opencv/highgui.h"
-
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 
 namespace baidu {
 namespace paddle_serving {
diff --git a/demo-serving/op/text_classification_op.h b/demo-serving/op/text_classification_op.h
index 21ac6991..44c25931 100644
--- a/demo-serving/op/text_classification_op.h
+++ b/demo-serving/op/text_classification_op.h
@@ -14,15 +14,7 @@
 
 #pragma once
 #include <vector>
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "demo-serving/text_classification.pb.h"
 
 namespace baidu {
diff --git a/inferencer-fluid-cpu/include/fluid_cpu_engine.h b/inferencer-fluid-cpu/include/fluid_cpu_engine.h
index a7ba3ae1..114710e3 100644
--- a/inferencer-fluid-cpu/include/fluid_cpu_engine.h
+++ b/inferencer-fluid-cpu/include/fluid_cpu_engine.h
@@ -21,15 +21,7 @@
 #include <vector>
 #include "configure/include/configure_parser.h"
 #include "configure/inferencer_configure.pb.h"
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "predictor/framework/infer.h"
 
 namespace baidu {
diff --git a/inferencer-fluid-gpu/include/fluid_gpu_engine.h b/inferencer-fluid-gpu/include/fluid_gpu_engine.h
index 433f1912..2b61c89d 100644
--- a/inferencer-fluid-gpu/include/fluid_gpu_engine.h
+++ b/inferencer-fluid-gpu/include/fluid_gpu_engine.h
@@ -23,15 +23,7 @@
 #include <vector>
 #include "configure/include/configure_parser.h"
 #include "configure/inferencer_configure.pb.h"
-#ifdef BCLOUD
-#ifdef WITH_GPU
-#include "paddle/paddle_inference_api.h"
-#else
-#include "paddle/fluid/inference/api/paddle_inference_api.h"
-#endif
-#else
 #include "paddle_inference_api.h"  // NOLINT
-#endif
 #include "predictor/framework/infer.h"
 
 DECLARE_int32(gpuid);
diff --git a/kvdb/include/kvdb/kvdb_impl.h b/kvdb/include/kvdb/kvdb_impl.h
index 8dde028b..cab06cad 100644
--- a/kvdb/include/kvdb/kvdb_impl.h
+++ b/kvdb/include/kvdb/kvdb_impl.h
@@ -31,6 +31,7 @@
 #include <memory>
 #include <unordered_map>
 #include <vector>
+#include <functional>
 class AbstractKVDB;
 class FileReader;
 class ParamDict;
-- 
GitLab