Merge develop

051d6c86 · Yu Yang · 9cc99074 · 051d6c86 · 051d6c86
隐藏空白更改
内联并排

Showing with 4 addition and 4 deletion

paddle/framework/backward_test.cc paddle/framework/backward_test.cc +2 -2

paddle/framework/net_op_test.cc paddle/framework/net_op_test.cc +2 -2

未找到文件。
--- 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 {}
 };