From: Kefu Chai <kchai@redhat.com>
Date: Wed, 19 Jul 2017 13:57:07 +0000 (+0800)
Subject: include/assert: test c++ before using static_cast<>
X-Git-Tag: v12.1.2~215^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F16424%2Fhead;p=ceph.git

include/assert: test c++ before using static_cast<>

this partially reverts 2e7c72d.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/include/assert.h b/src/include/assert.h
index bd39187a7a7e..f3e0e39f9b29 100644
--- a/src/include/assert.h
+++ b/src/include/assert.h
@@ -22,9 +22,9 @@
 # include "acconfig.h"
 #endif
 
+#ifdef __cplusplus
 class CephContext;
 
-#ifdef __cplusplus
 namespace ceph {
 
 struct BackTrace;
@@ -62,17 +62,25 @@ struct BackTrace;
 # define __CEPH_ASSERT_FUNCTION ((__const char *) 0)
 #endif
 
+#ifdef __cplusplus
 extern void register_assert_context(CephContext *cct);
+#endif
+
 extern void __ceph_assert_fail(const char *assertion, const char *file, int line, const char *function)
   __attribute__ ((__noreturn__));
 extern void __ceph_assertf_fail(const char *assertion, const char *file, int line, const char *function, const char* msg, ...)
   __attribute__ ((__noreturn__));
 extern void __ceph_assert_warn(const char *assertion, const char *file, int line, const char *function);
 
+#ifdef __cplusplus
+# define _CEPH_ASSERT_VOID_CAST static_cast<void>
+#else
+# define _CEPH_ASSERT_VOID_CAST (void)
+#endif
 
 #define assert_warn(expr)							\
   ((expr)								\
-   ? static_cast<void> (0)				\
+   ? _CEPH_ASSERT_VOID_CAST (0)					\
    : __ceph_assert_warn (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION))
 
 #ifdef __cplusplus
@@ -115,34 +123,34 @@ using namespace ceph;
 
 #define assert(expr)							\
   ((expr)								\
-   ? static_cast<void> (0)				\
+   ? _CEPH_ASSERT_VOID_CAST (0)					\
    : __ceph_assert_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION))
 #define ceph_assert(expr)							\
   ((expr)								\
-   ? static_cast<void> (0)				\
+   ? _CEPH_ASSERT_VOID_CAST (0)					\
    : __ceph_assert_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION))
 
 // this variant will *never* get compiled out to NDEBUG in the future.
 // (ceph_assert currently doesn't either, but in the future it might.)
 #define ceph_assert_always(expr)							\
   ((expr)								\
-   ? static_cast<void> (0)				\
+   ? _CEPH_ASSERT_VOID_CAST (0)					\
    : __ceph_assert_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION))
 
 // Named by analogy with printf.  Along with an expression, takes a format
 // string and parameters which are printed if the assertion fails.
 #define assertf(expr, ...)                  \
   ((expr)								\
-   ? static_cast<void> (0)				\
+   ? _CEPH_ASSERT_VOID_CAST (0)					\
    : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__))
 #define ceph_assertf(expr, ...)                  \
   ((expr)								\
-   ? static_cast<void> (0)				\
+   ? _CEPH_ASSERT_VOID_CAST (0)					\
    : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__))
 
 // this variant will *never* get compiled out to NDEBUG in the future.
 // (ceph_assertf currently doesn't either, but in the future it might.)
 #define ceph_assertf_always(expr, ...)                  \
   ((expr)								\
-   ? static_cast<void> (0)				\
+   ? _CEPH_ASSERT_VOID_CAST (0)					\
    : __ceph_assertf_fail (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION, __VA_ARGS__))