From 38af7bcaaf2b1777f16ce4a1e6c89beb2ab6902b Mon Sep 17 00:00:00 2001
From: Yan Chunwei <yanchunwei@outlook.com>
Date: Tue, 29 May 2018 19:37:40 +0800
Subject: [PATCH] fix manylinux compile error caused by inference lib (#10994)

* update

* remove warning

* Update test_paddle_inference_api_impl.cc
---
 paddle/contrib/inference/paddle_inference_api_impl.cc      | 3 ++-
 paddle/contrib/inference/test_paddle_inference_api_impl.cc | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/paddle/contrib/inference/paddle_inference_api_impl.cc b/paddle/contrib/inference/paddle_inference_api_impl.cc
index 8fb650a7330..e7a0b341dda 100644
--- a/paddle/contrib/inference/paddle_inference_api_impl.cc
+++ b/paddle/contrib/inference/paddle_inference_api_impl.cc
@@ -140,7 +140,8 @@ std::unique_ptr<PaddlePredictor> PaddlePredictorImpl::Clone() {
     LOG(ERROR) << "fail to call InitShared";
     return nullptr;
   }
-  return cls;
+  // fix manylinux compile error.
+  return std::move(cls);
 }
 
 // TODO(panyx0718): Consider merge with Init()?
diff --git a/paddle/contrib/inference/test_paddle_inference_api_impl.cc b/paddle/contrib/inference/test_paddle_inference_api_impl.cc
index b103cfab3f0..2a58f6989d5 100644
--- a/paddle/contrib/inference/test_paddle_inference_api_impl.cc
+++ b/paddle/contrib/inference/test_paddle_inference_api_impl.cc
@@ -68,11 +68,11 @@ TEST(paddle_inference_api_impl, word2vec) {
 
   std::vector<PaddleTensor> outputs;
   ASSERT_TRUE(predictor->Run(cpu_feeds, &outputs));
-  ASSERT_EQ(outputs.size(), 1);
+  ASSERT_EQ(outputs.size(), 1UL);
   for (size_t i = 0; i < outputs.size(); ++i) {
     size_t len = outputs[i].data.length;
     float* data = static_cast<float*>(outputs[i].data.data);
-    for (int j = 0; j < len / sizeof(float); ++j) {
+    for (size_t j = 0; j < len / sizeof(float); ++j) {
       ASSERT_LT(data[j], 1.0);
       ASSERT_GT(data[j], -1.0);
     }
-- 
GitLab