para/GSL
1
0
Fork 0
mirror of https://github.com/microsoft/GSL.git synced 2024-11-03 17:56:43 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

[multi_span] Fix UB hack in static_bounds::operator=

Browse Source 
* Make BoundsRanges<dynamic_range, ...>::m_bound non-const and private

* Remove various defaulted copy constructor/assignment declarations from BoundsRanges specializations whose only effect is to needlessly suppress the generation of moves

* Remove the hackish static_bounds::operator=(const static_bounds&). The implicitly generated default is now sufficient
This commit is contained in:
Casey Carter 2016-09-27 21:12:51 -07:00
parent 348a859547
commit 67717ea6ae
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gsl/multi_span
View File

@ -308,8 +308,6 @@ namespace details
{
}
BoundsRanges(const BoundsRanges&) = default;
BoundsRanges& operator=(const BoundsRanges&) = default;
BoundsRanges(const std::ptrdiff_t* const) {}
BoundsRanges() = default;
@ -346,9 +344,9 @@ namespace details
static const size_t DynamicNum = Base::DynamicNum + 1;
static const size_type CurrentRange = dynamic_range;
static const size_type TotalSize = dynamic_range;
const size_type m_bound;
BoundsRanges(const BoundsRanges&) = default;
private:
size_type m_bound;
public:
BoundsRanges(const std::ptrdiff_t* const arr)
: Base(arr + 1), m_bound(*arr * this->Base::totalSize())
@ -420,8 +418,6 @@ namespace details
static const size_type TotalSize =
Base::TotalSize == dynamic_range ? dynamic_range : CurrentRange * Base::TotalSize;
BoundsRanges(const BoundsRanges&) = default;
BoundsRanges(const std::ptrdiff_t* const arr) : Base(arr) {}
BoundsRanges() = default;
@ -633,12 +629,6 @@ public:
constexpr static_bounds() = default;
constexpr static_bounds& operator=(const static_bounds& otherBounds)
{
new (&m_ranges) MyRanges(otherBounds.m_ranges);
return *this;
}
constexpr sliced_type slice() const noexcept
{
return sliced_type{static_cast<const details::BoundsRanges<RestRanges...>&>(m_ranges)};