aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorNeil MacIntosh <neilmac@microsoft.com>2016-07-29 11:16:06 -0700
committerNeil MacIntosh <neilmac@microsoft.com>2016-07-29 11:16:06 -0700
commit8e31f53f8a3132c497363bd87f03204d3d7969af (patch)
treeda7db6d217a5570a5444b18e4446d9fb738682f7 /tests
parenta0cf1ecc499b9a5609dd3436c5d83d08a3377f9d (diff)
downloadplatform_external_Microsoft-GSL-8e31f53f8a3132c497363bd87f03204d3d7969af.tar.gz
platform_external_Microsoft-GSL-8e31f53f8a3132c497363bd87f03204d3d7969af.tar.bz2
platform_external_Microsoft-GSL-8e31f53f8a3132c497363bd87f03204d3d7969af.zip
Building clean with MSVC12.
Diffstat (limited to 'tests')
-rw-r--r--tests/span_tests.cpp8
-rw-r--r--tests/utils_tests.cpp2
2 files changed, 9 insertions, 1 deletions
diff --git a/tests/span_tests.cpp b/tests/span_tests.cpp
index 77b799a..8c9829d 100644
--- a/tests/span_tests.cpp
+++ b/tests/span_tests.cpp
@@ -839,7 +839,9 @@ SUITE(span_tests)
CHECK(it - beyond == 0);
for (auto& n : s)
+ {
CHECK(n == 5);
+ }
}
}
@@ -881,7 +883,9 @@ SUITE(span_tests)
CHECK(it - beyond == 0);
for (auto& n : s)
+ {
CHECK(n == 5);
+ }
}
}
@@ -923,7 +927,9 @@ SUITE(span_tests)
CHECK(it - beyond == 0);
for (auto& n : s)
+ {
CHECK(n == 5);
+ }
}
}
@@ -965,7 +971,9 @@ SUITE(span_tests)
CHECK(it - beyond == 0);
for (auto& n : s)
+ {
CHECK(n == 5);
+ }
}
}
diff --git a/tests/utils_tests.cpp b/tests/utils_tests.cpp
index a46d6e4..11582de 100644
--- a/tests/utils_tests.cpp
+++ b/tests/utils_tests.cpp
@@ -103,7 +103,7 @@ SUITE(utils_tests)
CHECK(narrow<uint32_t>(int32_t(0)) == 0);
CHECK(narrow<uint32_t>(int32_t(1)) == 1);
- CHECK(narrow<uint32_t>(int32_max) == int32_max);
+ CHECK(narrow<uint32_t>(int32_max) == static_cast<uint32_t>(int32_max));
CHECK_THROW(narrow<uint32_t>(int32_t(-1)), narrowing_error);
CHECK_THROW(narrow<uint32_t>(int32_min), narrowing_error);