diff options
| author | Robert Guo <robert.guo@10gen.com> | 2018-02-28 17:06:34 -0500 |
|---|---|---|
| committer | Robert Guo <robert.guo@10gen.com> | 2018-03-01 11:06:44 -0500 |
| commit | db6e903221712585f830cacead3269a0fbf44f1b (patch) | |
| tree | 4a7e3c9b03012cdb64bfe11a205b1d95585f36cd /src | |
| parent | 71852a5862af3ab77acd18d29e68f063616d8cad (diff) | |
| download | mongo-db6e903221712585f830cacead3269a0fbf44f1b.tar.gz | |
SERVER-33560 Remove deprecated Fixture function declarations from Google Benchmark
Diffstat (limited to 'src')
| -rw-r--r-- | src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h | 10 | ||||
| -rw-r--r-- | src/third_party/benchmark-1.3.0/patches/0003-Remove-deprecated-benchmark-fixture-function-decl.patch | 34 |
2 files changed, 38 insertions, 6 deletions
diff --git a/src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h b/src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h index 15ed02e5389..c8360dafa8e 100644 --- a/src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h +++ b/src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h @@ -943,12 +943,10 @@ class Fixture : public internal::Benchmark { this->TearDown(st); } - // These will be deprecated ... - virtual void SetUp(const State&) {} - virtual void TearDown(const State&) {} - // ... In favor of these. - virtual void SetUp(State& st) { SetUp(const_cast<const State&>(st)); } - virtual void TearDown(State& st) { TearDown(const_cast<const State&>(st)); } + // MONGODB MODIFICATION: Remove the deprecated version of SetUp() and TearDown() that + // require `const State&` as an argument. + virtual void SetUp(State&) {} + virtual void TearDown(State&) {} protected: virtual void BenchmarkCase(State&) = 0; diff --git a/src/third_party/benchmark-1.3.0/patches/0003-Remove-deprecated-benchmark-fixture-function-decl.patch b/src/third_party/benchmark-1.3.0/patches/0003-Remove-deprecated-benchmark-fixture-function-decl.patch new file mode 100644 index 00000000000..b3686af4481 --- /dev/null +++ b/src/third_party/benchmark-1.3.0/patches/0003-Remove-deprecated-benchmark-fixture-function-decl.patch @@ -0,0 +1,34 @@ +From 9db968c3544432d17191a1b3c8873873dcd672fe Mon Sep 17 00:00:00 2001 +From: Robert Guo <robert.guo@10gen.com> +Date: Wed, 28 Feb 2018 17:06:34 -0500 +Subject: [PATCH] SERVER-33560 Remove deprecated Fixture function declarations + from Google Benchmark + +--- + .../benchmark-1.3.0/benchmark/include/benchmark/benchmark.h | 10 ++++------ + 1 file changed, 4 insertions(+), 6 deletions(-) + +diff --git a/src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h b/src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h +index 15ed02e538..2183c8a1d2 100644 +--- a/src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h ++++ b/src/third_party/benchmark-1.3.0/benchmark/include/benchmark/benchmark.h +@@ -943,12 +943,10 @@ class Fixture : public internal::Benchmark { + this->TearDown(st); + } + +- // These will be deprecated ... +- virtual void SetUp(const State&) {} +- virtual void TearDown(const State&) {} +- // ... In favor of these. +- virtual void SetUp(State& st) { SetUp(const_cast<const State&>(st)); } +- virtual void TearDown(State& st) { TearDown(const_cast<const State&>(st)); } ++ // MONGODB MODIFICATION: Remove the deprecated version of SetUp() and TearDown() that ++ // require `const State&` as an argument. ++ virtual void SetUp(State&) {} ++ virtual void TearDown(State&) {} + + protected: + virtual void BenchmarkCase(State&) = 0; +-- +2.14.3 (Apple Git-98) + |