diff --git a/paddle/fluid/platform/enforce.h b/paddle/fluid/platform/enforce.h
index eee8173ba59f28d83e887924cdcea9389a77b512..ec4d0bf910127d26e22076b723fd1359ff069464 100644
--- a/paddle/fluid/platform/enforce.h
+++ b/paddle/fluid/platform/enforce.h
@@ -258,21 +258,33 @@ inline void throw_on_error(T e) {
 #define PADDLE_THROW(...) \
   throw ::paddle::platform::EnforceNotMet(__FILE__, __LINE__, __VA_ARGS__)
 
-#define PADDLE_JUDGE
-
-#define __PADDLE_UNARY_COMPARE(COND, ...)                        \
-  do {                                                           \
-    auto __cond = COND;                                          \
-    if (UNLIKELY(::paddle::platform::is_error(__cond))) {        \
-      ::paddle::platform::throw_on_error(__cond, ##__VA_ARGS__); \
-    }                                                            \
+#define PADDLE_THROW_ERROR(COND, ...)                                   \
+  PADDLE_THROW_I(__VA_ARGS__,                                           \
+                 ::paddle::platform::throw_on_error(COND, __VA_ARGS__), \
+                 ::paddle::platform::throw_on_error(COND, __VA_ARGS__), \
+                 ::paddle::platform::throw_on_error(COND, __VA_ARGS__), \
+                 ::paddle::platform::throw_on_error(COND, __VA_ARGS__), \
+                 ::paddle::platform::throw_on_error(COND, __VA_ARGS__), \
+                 ::paddle::platform::throw_on_error(COND, __VA_ARGS__), \
+                 ::paddle::platform::throw_on_error(COND, __VA_ARGS__), \
+                 ::paddle::platform::throw_on_error(COND, __VA_ARGS__), \
+                 ::paddle::platform::throw_on_error(COND))
+
+#define PADDLE_THROW_I(_, _9, _8, _7, _6, _5, _4, _3, _2, X_, ...) X_;
+
+#define __PADDLE_UNARY_COMPARE(COND, ...)                 \
+  do {                                                    \
+    auto __cond = COND;                                   \
+    if (UNLIKELY(::paddle::platform::is_error(__cond))) { \
+      PADDLE_THROW_ERROR(COND, __VA_ARGS__);              \
+    }                                                     \
   } while (0)
 
 #ifndef REPLACE_ENFORCE_GLOG
 #define PADDLE_ENFORCE(COND, ...)                                       \
   do {                                                                  \
     try {                                                               \
-      __PADDLE_UNARY_COMPARE(COND, ##__VA_ARGS__);                      \
+      __PADDLE_UNARY_COMPARE(COND, __VA_ARGS__);                        \
     } catch (...) {                                                     \
       throw ::paddle::platform::EnforceNotMet(std::current_exception(), \
                                               __FILE__, __LINE__);      \
@@ -280,7 +292,7 @@ inline void throw_on_error(T e) {
   } while (0)
 
 #else
-#define PADDLE_ENFORCE(COND, ...) __PADDLE_UNARY_COMPARE(COND, ##__VA_ARGS__);
+#define PADDLE_ENFORCE(COND, ...) __PADDLE_UNARY_COMPARE(COND, __VA_ARGS__);
 #endif  // REPLACE_ENFORCE_GLOG
 
 #define PADDLE_THROW_EOF()                                                     \