From 051d6c86922c89a7c73ca4628ccceb9a1c09fdb9 Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Tue, 1 Aug 2017 19:41:04 +0800
Subject: [PATCH] Merge develop

---
 paddle/framework/backward_test.cc | 4 ++--
 paddle/framework/net_op_test.cc   | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/paddle/framework/backward_test.cc b/paddle/framework/backward_test.cc
index 2e892f12fb5..b095c2c3d5d 100644
--- a/paddle/framework/backward_test.cc
+++ b/paddle/framework/backward_test.cc
@@ -23,8 +23,8 @@ namespace framework {
 
 class EmptyOp : public OperatorBase {
  public:
-  void InferShape(const std::shared_ptr<Scope> &scope) const override {}
-  void Run(const std::shared_ptr<Scope> &scope,
+  void InferShape(const Scope &scope) const override {}
+  void Run(const Scope &scope,
            const platform::DeviceContext &dev_ctx) const override {}
 };
 
diff --git a/paddle/framework/net_op_test.cc b/paddle/framework/net_op_test.cc
index 5b5972b3b23..f32e456e5d1 100644
--- a/paddle/framework/net_op_test.cc
+++ b/paddle/framework/net_op_test.cc
@@ -22,8 +22,8 @@ class TestOp : public OperatorBase {
 
 class EmptyOp : public OperatorBase {
  public:
-  void InferShape(const std::shared_ptr<Scope>& scope) const override {}
-  void Run(const std::shared_ptr<Scope>& scope,
+  void InferShape(const Scope& scope) const override {}
+  void Run(const Scope& scope,
            const platform::DeviceContext& dev_ctx) const override {}
 };
 
-- 
GitLab