summaryrefslogtreecommitdiffstats
path: root/contrib/libc++/include/__config
diff options
context:
space:
mode:
authortheraven <theraven@FreeBSD.org>2012-05-03 17:44:07 +0000
committertheraven <theraven@FreeBSD.org>2012-05-03 17:44:07 +0000
commit011d8001e295ab428f3d73602d2e4fa0b248efc4 (patch)
treea0abba0a80f7ff64ba1a78df7fd8544414370f33 /contrib/libc++/include/__config
parent72d6cdcd97718bf58e38b0484a01bf5c6de14bc4 (diff)
downloadFreeBSD-src-011d8001e295ab428f3d73602d2e4fa0b248efc4.zip
FreeBSD-src-011d8001e295ab428f3d73602d2e4fa0b248efc4.tar.gz
Import new version of libc++. Among other improvements, this comes with an
<atomic> header that works with clang 3.1 (and, importantly, the pre-3.1 snapshot currently in head)
Diffstat (limited to 'contrib/libc++/include/__config')
-rw-r--r--contrib/libc++/include/__config4
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/libc++/include/__config b/contrib/libc++/include/__config
index 6b29014..7cd01dc 100644
--- a/contrib/libc++/include/__config
+++ b/contrib/libc++/include/__config
@@ -384,7 +384,9 @@ template <unsigned> struct __static_assert_check {};
#endif
#ifdef _LIBCPP_HAS_NO_CONSTEXPR
-#define constexpr const
+#define _LIBCPP_CONSTEXPR
+#else
+#define _LIBCPP_CONSTEXPR constexpr
#endif
#ifndef __has_feature
OpenPOWER on IntegriCloud