commit f9c7310e7abac3daa09de94f4579c0f41d2924fc
author Eric Fiselier <eric@efcs.ca> Sun Oct 16 03:49:18 2016 +0000
committer Eric Fiselier <eric@efcs.ca> Sun Oct 16 03:49:18 2016 +0000
tree 2db0683dde44d03180b5124baef230c03a235c15
parent f72aaff994ee995360817244def4db1579f0cd7a

Fix use of non-constexpr C++14 addressof

llvm-svn: 284325

libcxx/include/experimental/optional

diff --git a/libcxx/include/experimental/optional b/libcxx/include/experimental/optional
index ebe11e6..57c5335 100644
--- a/libcxx/include/experimental/optional
+++ b/libcxx/include/experimental/optional
@@ -488,7 +488,7 @@
     {
         _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