From eca45928d5f3f9b1c2219fd71adb72160fee9edf Mon Sep 17 00:00:00 2001
From: Yu Yang <yuyang18@baidu.com>
Date: Tue, 27 Dec 2016 13:15:27 +0800
Subject: [PATCH] Fix merge errors.

---
 paddle/api/PaddleAPI.h | 2 +-
 paddle/utils/common.h  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/paddle/api/PaddleAPI.h b/paddle/api/PaddleAPI.h
index e83718448dd..09c891871a5 100644
--- a/paddle/api/PaddleAPI.h
+++ b/paddle/api/PaddleAPI.h
@@ -870,7 +870,7 @@ struct EvaluatorPrivate;
 class Evaluator {
 private:
   Evaluator();
-  DISABLE_COPY_AND_ASSIGN(Evaluator);
+  DISABLE_COPY(Evaluator);
 
 public:
   ~Evaluator();
diff --git a/paddle/utils/common.h b/paddle/utils/common.h
index 3ff0b869478..202a9d980d8 100644
--- a/paddle/utils/common.h
+++ b/paddle/utils/common.h
@@ -14,8 +14,6 @@ limitations under the License. */
 
 #pragma once
 
-namespace paddle {
-
 /**
  * Disable copy macro.
  */
@@ -24,6 +22,8 @@ namespace paddle {
   class_name(const class_name &other) = delete; \
   class_name &operator=(const class_name &other) = delete
 
+namespace paddle {
+
 #ifdef PADDLE_TYPE_DOUBLE
 using real = double;
 #else
-- 
GitLab