Skip to content

Removed const workaround on Windows #2901

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JohanMabille wants to merge 1 commit into from
Closed

Removed const workaround on Windows #2901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 1 addition & 9 deletions include/xtensor/containers/xstorage.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1431,12 +1431,6 @@ namespace xt
using allocator_type = std::conditional_t<Align != 0, xt_simd::aligned_allocator<T, Align>, std::allocator<T>>;
};

#if defined(_MSC_VER)
#define XTENSOR_CONST
#else
#define XTENSOR_CONST const
#endif

/**
* A std::array like class with all member function (except reverse iterators)
* as constexpr. The data is immutable once set.
Expand Down Expand Up @@ -1528,7 +1522,7 @@ namespace xt
return N;
}

XTENSOR_CONST T m_data[N > 0 ? N : 1];
const T m_data[N > 0 ? N : 1];
};

template <class T, std::size_t N>
Expand Down Expand Up @@ -1896,6 +1890,4 @@ namespace std
#endif
// clang-format on

#undef XTENSOR_CONST

#endif
Loading