Merge commit 'bd4da1a9b9f148c4e42d45fe381ab4085b95b99d' into update_multi_for_afqmc

This commit is contained in:
Alfredo Correa 2021-03-18 18:15:47 -07:00
commit 53dbfdfbbd
1 changed files with 5 additions and 2 deletions

View File

@ -1077,9 +1077,12 @@ private:
public:
HD constexpr array_iterator operator+(difference_type n) const{array_iterator ret{*this}; ret+=n; return ret;}
[[deprecated("use base() for iterator")]] constexpr element_ptr data() const{return data_;}
// constexpr here creates problems with intel 19
constexpr element_ptr base() const& {return data_;}
friend constexpr element_ptr base(array_iterator const& s){return s.base();}
friend
#ifndef __INTEL_COMPILER
constexpr // this generates a problem with intel compiler 19 "a constexpr function cannot have a nonliteral return type"
#endif
element_ptr base(array_iterator const& s){return s.base();}
constexpr stride_type stride() const& {return stride_;} friend
constexpr stride_type stride(array_iterator const& s){return s.stride_;}
constexpr array_iterator& operator++(){data_+=stride_; return *this;}