resolve conflicts

PaddlePaddle · May 29, 2018 · 065eaf0 · 065eaf0
1 parent af05d46
commit 065eaf0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/paddle/contrib/inference/paddle_inference_api_impl.cc b/paddle/contrib/inference/paddle_inference_api_impl.cc
@@ -299,7 +299,7 @@ std::unique_ptr<PaddlePredictor> CreatePaddlePredictor(
   if (!dynamic_cast<PaddlePredictorImpl *>(predictor.get())->Init()) {
     return nullptr;
   }
-  return predictor;
+  return std::move(predictor);
 }
 
 }  // namespace paddle
diff --git a/paddle/contrib/inference/test_paddle_inference_api_impl.cc b/paddle/contrib/inference/test_paddle_inference_api_impl.cc
@@ -71,7 +71,7 @@ TEST(paddle_inference_api_impl, word2vec) {
 
   std::vector<PaddleTensor> outputs;
   ASSERT_TRUE(predictor->Run(paddle_tensor_feeds, &outputs));
-  ASSERT_EQ(outputs.size(), 1);
+  ASSERT_EQ(outputs.size(), 1UL);
   size_t len = outputs[0].data.length;
   float* data = static_cast<float*>(outputs[0].data.data);
   for (int j = 0; j < len / sizeof(float); ++j) {
@@ -143,7 +143,7 @@ TEST(paddle_inference_api_impl, image_classification) {
   size_t len = outputs[0].data.length;
   float* data = static_cast<float*>(outputs[0].data.data);
   float* lod_data = output1.data<float>();
-  for (int j = 0; j < len / sizeof(float); ++j) {
+  for (size_t j = 0; j < len / sizeof(float); ++j) {
     EXPECT_LT(lod_data[j] - data[j], 1e-10);
     EXPECT_GT(lod_data[j] - data[j], -1e-10);
   }