From f9c7310e7abac3daa09de94f4579c0f41d2924fc Mon Sep 17 00:00:00 2001
From: Eric Fiselier <eric@efcs.ca>
Date: Sun, 16 Oct 2016 03:49:18 +0000
Subject: Fix use of non-constexpr C++14 addressof

llvm-svn: 284325
---
 libcxx/include/experimental/optional | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libcxx/include')

diff --git a/libcxx/include/experimental/optional b/libcxx/include/experimental/optional
index ebe11e6b934..57c5335f637 100644
--- a/libcxx/include/experimental/optional
+++ b/libcxx/include/experimental/optional
@@ -488,7 +488,7 @@ public:
     {
         _LIBCPP_ASSERT(this->__engaged_, "optional operator-> called for disengaged value");
 #ifndef _LIBCPP_HAS_NO_BUILTIN_ADDRESSOF
-        return _VSTD::addressof(this->__val_);
+        return __builtin_addressof(this->__val_);
 #else
         return __operator_arrow(__has_operator_addressof<value_type>{});
 #endif
-- 
cgit v1.2.3