From 092c475e250af64e7b9ba459067d43cb71fb6dfd Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Tue, 14 Jul 2015 17:50:27 +0000
Subject: Fix PR24114 - std::atomic for non-Clang is not a literal type

Add _LIBCPP_CONSTEXPR to the implementation of __gcc_atomic_t.

llvm-svn: 242172
---
 libcxx/include/atomic | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'libcxx/include')

diff --git a/libcxx/include/atomic b/libcxx/include/atomic
index 5bc71f0032b..97a998d3363 100644
--- a/libcxx/include/atomic
+++ b/libcxx/include/atomic
@@ -554,7 +554,8 @@ namespace __gcc_atomic {
 template <typename _Tp>
 struct __gcc_atomic_t {
   __gcc_atomic_t() _NOEXCEPT {}
-  explicit __gcc_atomic_t(_Tp value) _NOEXCEPT : __a_value(value) {}
+  _LIBCPP_CONSTEXPR explicit __gcc_atomic_t(_Tp value) _NOEXCEPT
+    : __a_value(value) {}
   _Tp __a_value;
 };
 #define _Atomic(x) __gcc_atomic::__gcc_atomic_t<x>
-- 
cgit v1.2.3