summaryrefslogtreecommitdiffstats
path: root/libcxx/include
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2016-10-16 03:49:18 +0000
committerEric Fiselier <eric@efcs.ca>2016-10-16 03:49:18 +0000
commitf9c7310e7abac3daa09de94f4579c0f41d2924fc (patch)
tree2db0683dde44d03180b5124baef230c03a235c15 /libcxx/include
parentf72aaff994ee995360817244def4db1579f0cd7a (diff)
downloadbcm5719-llvm-f9c7310e7abac3daa09de94f4579c0f41d2924fc.tar.gz
bcm5719-llvm-f9c7310e7abac3daa09de94f4579c0f41d2924fc.zip
Fix use of non-constexpr C++14 addressof
llvm-svn: 284325
Diffstat (limited to 'libcxx/include')
-rw-r--r--libcxx/include/experimental/optional2
1 files changed, 1 insertions, 1 deletions
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
OpenPOWER on IntegriCloud