From e00aae5386e4c2e9bef0e942f3be4405874c4f1c Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Tue, 18 Jul 2017 13:02:22 +0800
Subject: [PATCH] Fix Merge Bugs

* There is a merge conflict when merge PR #2914
* Develop and PR #2914 both add `DDim::size` method, but did not
  triger git merge conflict while merge.
---
 paddle/framework/ddim.cc | 2 --
 paddle/framework/ddim.h  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/paddle/framework/ddim.cc b/paddle/framework/ddim.cc
index d9d5e9f66e..d2ef85afe5 100644
--- a/paddle/framework/ddim.cc
+++ b/paddle/framework/ddim.cc
@@ -280,8 +280,6 @@ std::ostream& operator<<(std::ostream& os, const DDim& ddim) {
   return os;
 }
 
-ssize_t DDim::size() const { return arity(*this); }
-
 DDim::DDim(std::initializer_list<int> init_list) {
   *this = make_ddim(init_list);
 }
diff --git a/paddle/framework/ddim.h b/paddle/framework/ddim.h
index 0d10745a9e..3976c6c029 100644
--- a/paddle/framework/ddim.h
+++ b/paddle/framework/ddim.h
@@ -52,8 +52,6 @@ struct DDim {
 
   DDimVar getVar() { return var; }
 
-  ssize_t size() const;
-
   bool operator==(DDim d) const;
 
   bool operator!=(DDim d) const;
-- 
GitLab