Fix merge errors.

paddle/api/PaddleAPI.h

@@ -870,7 +870,7 @@ struct EvaluatorPrivate;
 class Evaluator {
 private:
   Evaluator();
-  DISABLE_COPY_AND_ASSIGN(Evaluator);
+  DISABLE_COPY(Evaluator);
 
 public:
   ~Evaluator();

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