[libcxx-commits] [libcxx] r352007 - Change a couple of '&' to addressof(). NFC

[Marshall Clow via libcxx-commits]

Author: marshall
Date: Wed Jan 23 18:02:50 2019
New Revision: 352007

URL: http://llvm.org/viewvc/llvm-project?rev=352007&view=rev
Log:
Change a couple of '&' to addressof(). NFC

Modified:
    libcxx/trunk/include/regex

Modified: libcxx/trunk/include/regex
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/regex?rev=352007&r1=352006&r2=352007&view=diff
==============================================================================
--- libcxx/trunk/include/regex (original)
+++ libcxx/trunk/include/regex Wed Jan 23 18:02:50 2019
@@ -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, _
                    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<_BidirectionalItera
                              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);
 }