Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions include/boost/multi/array_ref.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -486,10 +486,10 @@ struct array_iterator;
template<class Element, ::boost::multi::dimensionality_type D, typename ElementPtr, bool IsConst, bool IsMove, typename Stride>
struct array_iterator // NOLINT(fuchsia-multiple-inheritance) for facades
: boost::multi::iterator_facade<
array_iterator<Element, D, ElementPtr, IsConst, IsMove>, void, std::random_access_iterator_tag,
array_iterator<Element, D, ElementPtr, IsConst, IsMove, Stride>, void, std::random_access_iterator_tag,
subarray<Element, D - 1, ElementPtr> const&, typename layout_t<D - 1>::difference_type>
, multi::decrementable<array_iterator<Element, D, ElementPtr, IsConst, IsMove, Stride>>
, multi::incrementable<array_iterator<Element, D, ElementPtr, IsConst, IsMove, Stride>>
, multi::decrementable<array_iterator<Element, D, ElementPtr, IsConst, IsMove, Stride> >
, multi::incrementable<array_iterator<Element, D, ElementPtr, IsConst, IsMove, Stride> >
, multi::affine<array_iterator<Element, D, ElementPtr, IsConst, IsMove, Stride>, multi::difference_type>
, multi::totally_ordered2<array_iterator<Element, D, ElementPtr, IsConst, IsMove, Stride>, void> {
~array_iterator() = default; // lints(cppcoreguidelines-special-member-functions,hicpp-special-member-functions)
Expand Down Expand Up @@ -2487,7 +2487,7 @@ struct array_iterator<Element, 1, Ptr, IsConst, IsMove, Stride> // NOLINT(fuchs
#pragma warning(push)
#pragma warning(disable : 4820) // warning C4820: '7' bytes padding added after data member 'boost::multi::array_types<T,2,ElementPtr,Layout>::base_' [C:\Gitlab-Runner\builds\t3_1sV2uA\0\correaa\boost-multi\build\test\array_fancyref.cpp.x.vcxproj]
#endif
BOOST_MULTI_NO_UNIQUE_ADDRESS
// BOOST_MULTI_NO_UNIQUE_ADDRESS, testing removing this for MSVC-CUDA on Windows
stride_type stride_;
#if defined(_MSC_VER)
#pragma warning(pop)
Expand Down
2 changes: 1 addition & 1 deletion include/boost/multi/detail/config/NO_UNIQUE_ADDRESS.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#ifdef __has_cpp_attribute
#if __has_cpp_attribute(no_unique_address) >= 201803L && !defined(__NVCC__) && !defined(__PGI) && (__cplusplus >= 202002L || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L))
// NOLINTNEXTLINE(cppcoreguidelines-macro-usage) this macro will be needed until C++20
#define BOOST_MULTI_NO_UNIQUE_ADDRESS [[no_unique_address]]
#define BOOST_MULTI_NO_UNIQUE_ADDRESS // [[no_unique_address]]
#endif
#endif

Expand Down
Loading