From d08334011a155f00bc1160adf2e400a00f7c66c3 Mon Sep 17 00:00:00 2001
From: peizhilin <wopeizl@163.com>
Date: Fri, 9 Nov 2018 14:09:27 +0800
Subject: [PATCH] fix merge issue

---
 paddle/fluid/framework/ir/pass.h | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/paddle/fluid/framework/ir/pass.h b/paddle/fluid/framework/ir/pass.h
index a9199414b..e1767337a 100644
--- a/paddle/fluid/framework/ir/pass.h
+++ b/paddle/fluid/framework/ir/pass.h
@@ -217,28 +217,6 @@ struct PassRegistrar : public Registrar {
   extern int TouchPassRegistrar_##pass_type();                        \
   static int use_pass_itself_##pass_type##_ __UNUSED__() = \
       TouchPassRegistrar_##pass_type()
-#else
-#define REGISTER_PASS(pass_type, pass_class)                        \
-  STATIC_ASSERT_PASS_GLOBAL_NAMESPACE(                              \
-      __reg_pass__##pass_type,                                      \
-      "REGISTER_PASS must be called in global namespace");          \
-  static ::paddle::framework::ir::PassRegistrar<pass_class>         \
-      __pass_registrar_##pass_type##__(#pass_type);                 \
-  int TouchPassRegistrar_##pass_type() {                            \
-    __pass_registrar_##pass_type##__.Touch();                       \
-    return 0;                                                       \
-  }                                                                 \
-  static ::paddle::framework::ir::PassRegistrar<pass_class> UNUSED( \
-      &__pass_tmp_registrar_##pass_type##__) =                      \
-      __pass_registrar_##pass_type##__
-
-#define USE_PASS(pass_type)                           \
-  STATIC_ASSERT_PASS_GLOBAL_NAMESPACE(                \
-      __use_pass_itself_##pass_type,                  \
-      "USE_PASS must be called in global namespace"); \
-  extern int TouchPassRegistrar_##pass_type();        \
-  static int UNUSED(use_pass_itself_##pass_type##_) = \
-      TouchPassRegistrar_##pass_type()
 
 }  // namespace ir
 }  // namespace framework
-- 
GitLab