summaryrefslogtreecommitdiffstats
path: root/libcxx/include/regex
diff options
context:
space:
mode:
authorMarshall Clow <mclow.lists@gmail.com>2019-01-24 02:02:50 +0000
committerMarshall Clow <mclow.lists@gmail.com>2019-01-24 02:02:50 +0000
commit6973bb06d9c6d1704546748f869af1262e35f4c7 (patch)
tree6fa95bb7bc092c7d2a431ca55b46a955edc8a4a0 /libcxx/include/regex
parentf6b6be2f7a58aaf2f5307618969d00165385f21e (diff)
downloadbcm5719-llvm-6973bb06d9c6d1704546748f869af1262e35f4c7.tar.gz
bcm5719-llvm-6973bb06d9c6d1704546748f869af1262e35f4c7.zip
Change a couple of '&' to addressof(). NFC
llvm-svn: 352007
Diffstat (limited to 'libcxx/include/regex')
-rw-r--r--libcxx/include/regex6
1 files changed, 3 insertions, 3 deletions
diff --git a/libcxx/include/regex b/libcxx/include/regex
index d47978037dc..c381b5116af 100644
--- a/libcxx/include/regex
+++ b/libcxx/include/regex
@@ -6139,7 +6139,7 @@ public:
_LIBCPP_INLINE_VISIBILITY
reference operator*() const {return __match_;}
_LIBCPP_INLINE_VISIBILITY
- pointer operator->() const {return &__match_;}
+ pointer operator->() const {return _VSTD::addressof(__match_);}
regex_iterator& operator++();
_LIBCPP_INLINE_VISIBILITY
@@ -6163,7 +6163,7 @@ regex_iterator<_BidirectionalIterator, _CharT, _Traits>::
const regex_type& __re, regex_constants::match_flag_type __m)
: __begin_(__a),
__end_(__b),
- __pregex_(&__re),
+ __pregex_(_VSTD::addressof(__re)),
__flags_(__m)
{
_VSTD::regex_search(__begin_, __end_, __match_, *__pregex_, __flags_);
@@ -6404,7 +6404,7 @@ regex_token_iterator<_BidirectionalIterator, _CharT, _Traits>::
regex_constants::match_flag_type __m)
: __position_(__a, __b, __re, __m),
__n_(0),
- __subs_(__submatches, __submatches + _Np)
+ __subs_(begin(__submatches), end(__submatches))
{
__init(__a, __b);
}
OpenPOWER on IntegriCloud