Merge develop

8 years ago · 051d6c8692
parent 9cc990741e
commit 051d6c8692
2 changed files with 4 additions and 4 deletions
--- 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 {}
 };

--- 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 {}
 };