update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / include / ceph_assert.h

diff --git a/ceph/src/include/ceph_assert.h b/ceph/src/include/ceph_assert.h
index 3d63ee3c1622e2d32ded48d7006d100c52872332..0627894ea6e07d5d4451d3be29f9ab09b75cc6d7 100644 (file)
--- a/ceph/src/include/ceph_assert.h
+++ b/ceph/src/include/ceph_assert.h
@@ -4,13 +4,13 @@
 #include <cstdlib>
 #include <string>
 
-#if defined(__linux__)
-#include <features.h>
-
 #ifndef __STRING
 # define __STRING(x) #x
 #endif
 
+#if defined(__linux__)
+#include <features.h>
+
 #elif defined(__FreeBSD__)
 #include <sys/cdefs.h>
 #define        __GNUC_PREREQ(minor, major)     __GNUC_PREREQ__(minor, major)
@@ -70,7 +70,7 @@ extern void __ceph_assert_warn(const char *assertion, const char *file, int line
 #define assert_warn(expr)                                                      \
   ((expr)                                                              \
    ? _CEPH_ASSERT_VOID_CAST (0)                                        \
-   : __ceph_assert_warn (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION))
+   : ::ceph::__ceph_assert_warn (__STRING(expr), __FILE__, __LINE__, __CEPH_ASSERT_FUNCTION))
 
 }