Fix build issue with GCC8.2

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 {

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 {

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 {

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 {

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 {

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);

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;