Merge remote-tracking branch 'refs/remotes/Microsoft/master'

This commit is contained in:
vjacquet 2016-06-24 18:27:00 +02:00
commit a3fde02d06
2 changed files with 15 additions and 0 deletions

View File

@ -128,6 +128,10 @@ template <class Cont>
constexpr typename Cont::value_type& at(Cont& cont, size_t index)
{ Expects(index < cont.size()); return cont[index]; }
template <class T>
constexpr const T& at(std::initializer_list<T> cont, size_t index)
{ Expects(index < cont.size()); return *(cont.begin() + index); }
} // namespace gsl

View File

@ -17,6 +17,7 @@
#include <UnitTest++/UnitTest++.h>
#include <gsl.h>
#include <vector>
#include <initializer_list>
using namespace std;
using namespace gsl;
@ -52,6 +53,16 @@ SUITE(at_tests)
CHECK_THROW(at(a, 4), fail_fast);
}
TEST(InitializerList)
{
std::initializer_list<int> a = { 1, 2, 3, 4 };
for (int i = 0; i < 4; ++i)
CHECK(at(a, i) == i+1);
CHECK_THROW(at(a, 4), fail_fast);
}
}
int main(int, const char *[])