aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHaibo Huang <hhb@google.com>2019-09-27 16:41:29 -0700
committerandroid-build-merger <android-build-merger@google.com>2019-09-27 16:41:29 -0700
commit5eb44f371c9f1150f4fe9f2929c2b882f60adfc2 (patch)
treec98e540b160d200143fdcf4d97af0cf25d1477f5
parent76f3397dd13da6f9c0b7ef7d5eee52d2d64c7995 (diff)
parentb9e7dc7221d4115fc5287ee7b80866c9a73e76aa (diff)
downloadplatform_external_Microsoft-GSL-5eb44f371c9f1150f4fe9f2929c2b882f60adfc2.tar.gz
platform_external_Microsoft-GSL-5eb44f371c9f1150f4fe9f2929c2b882f60adfc2.tar.bz2
platform_external_Microsoft-GSL-5eb44f371c9f1150f4fe9f2929c2b882f60adfc2.zip
Upgrade Microsoft-GSL to 23066c829f227ca75cf44f7d727230fcdb7ccc8a
am: b9e7dc7221 Change-Id: I20492e1b95e1729ab5abfae7347b65bdd1288167
-rw-r--r--METADATA6
-rw-r--r--README.md2
-rw-r--r--tests/multi_span_tests.cpp4
-rw-r--r--tests/notnull_tests.cpp4
4 files changed, 11 insertions, 5 deletions
diff --git a/METADATA b/METADATA
index c265a59..f7b4a95 100644
--- a/METADATA
+++ b/METADATA
@@ -5,10 +5,10 @@ third_party {
type: GIT
value: "https://github.com/Microsoft/GSL"
}
- version: "b576cc6ce375cf42f6537d65a9ef29d67aa6b78e"
+ version: "23066c829f227ca75cf44f7d727230fcdb7ccc8a"
last_upgrade_date {
year: 2019
- month: 8
- day: 19
+ month: 9
+ day: 24
}
}
diff --git a/README.md b/README.md
index 183553f..df9fcb8 100644
--- a/README.md
+++ b/README.md
@@ -36,6 +36,8 @@ The test suite that exercises GSL has been built and passes successfully on the
* GNU/Linux using Clang/LLVM 6.0
* GNU/Linux using Clang/LLVM 7.0
* GNU/Linux using GCC 5.1
+* OS X Mojave 10.14.4 using Apple LLVM version 10.0.0 (10.0.1.10010046)
+* OS X Mojave 10.14.3 using Apple LLVM version 10.0.0 (clang-1000.11.45.5)
* OS X Yosemite using Xcode with Apple Clang 7.0.0.7000072
* OS X Yosemite using GCC-5.2.0
* OS X Sierra 10.12.4 using Apple LLVM version 8.1.0 (Clang-802.0.42)
diff --git a/tests/multi_span_tests.cpp b/tests/multi_span_tests.cpp
index 7e3ec89..17188be 100644
--- a/tests/multi_span_tests.cpp
+++ b/tests/multi_span_tests.cpp
@@ -1220,6 +1220,8 @@ TEST_CASE("md_access")
expected += 3;
}
}
+
+ delete[] image_ptr;
}
GSL_SUPPRESS(con.4) // NO-FORMAT: attribute
@@ -1616,6 +1618,8 @@ TEST_CASE("span_structure_size")
multi_span<const double, dynamic_range, 6, 4> av2 =
as_multi_span(av1, dim(5), dim<6>(), dim<4>());
(void) av2;
+
+ delete[] arr;
}
GSL_SUPPRESS(con.4) // NO-FORMAT: attribute
diff --git a/tests/notnull_tests.cpp b/tests/notnull_tests.cpp
index ce5a123..010dd00 100644
--- a/tests/notnull_tests.cpp
+++ b/tests/notnull_tests.cpp
@@ -234,8 +234,8 @@ void ostream_helper(T v)
{
std::ostringstream os;
std::ostringstream ref;
- os << p;
- ref << &v;
+ os << static_cast<void*>(p);
+ ref << static_cast<void*>(&v);
CHECK(os.str() == ref.str());
}
{