Merge pull request #1390 from npwoods/fix_null_option_guide

Subscripting std::array<..., 0> is bad; working around this specific case
This commit is contained in:
Vas Crabb 2016-09-11 11:37:20 +10:00 committed by GitHub
commit 407dede1a2

View File

@ -142,7 +142,7 @@ public:
template<typename... T> template<typename... T>
option_guide_impl(T &&... elems) option_guide_impl(T &&... elems)
: std::array<option_guide::entry, Count>({ std::forward<T>(elems)... }) : std::array<option_guide::entry, Count>({ std::forward<T>(elems)... })
, option_guide(&(*this)[0], &(*this)[0] + Count) , option_guide(Count > 0 ? &(*this)[0] : nullptr, Count > 0 ? &(*this)[0] + Count : nullptr)
{ {
} }
}; };