diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 16:35:47 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-11-18 15:45:54 +0000 |
| commit | 32f5a1c56531e4210bc4cf8d8c7825d66e081888 (patch) | |
| tree | eeeec6822f4d738d8454525233fd0e2e3a659e6d /chromium/third_party/googletest | |
| parent | 99677208ff3b216fdfec551fbe548da5520cd6fb (diff) | |
| download | qtwebengine-chromium-32f5a1c56531e4210bc4cf8d8c7825d66e081888.tar.gz | |
BASELINE: Update Chromium to 87.0.4280.67
Change-Id: Ib157360be8c2ffb2c73125751a89f60e049c1d54
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/googletest')
| -rw-r--r-- | chromium/third_party/googletest/BUILD.gn | 3 | ||||
| -rw-r--r-- | chromium/third_party/googletest/custom/gmock/internal/custom/gmock-port.h | 25 |
2 files changed, 0 insertions, 28 deletions
diff --git a/chromium/third_party/googletest/BUILD.gn b/chromium/third_party/googletest/BUILD.gn index eb6d0b38c77..e9b39c2968a 100644 --- a/chromium/third_party/googletest/BUILD.gn +++ b/chromium/third_party/googletest/BUILD.gn @@ -172,9 +172,6 @@ source_set("gmock") { "src/googlemock/include/gmock/internal/gmock-port.h", "src/googlemock/include/gmock/internal/gmock-pp.h", - # gmock helpers. - "custom/gmock/internal/custom/gmock-port.h", - #"src/googlemock/src/gmock-all.cc", # Not needed by our build. "src/googlemock/src/gmock-cardinalities.cc", "src/googlemock/src/gmock-internal-utils.cc", diff --git a/chromium/third_party/googletest/custom/gmock/internal/custom/gmock-port.h b/chromium/third_party/googletest/custom/gmock/internal/custom/gmock-port.h deleted file mode 100644 index de84e186b8f..00000000000 --- a/chromium/third_party/googletest/custom/gmock/internal/custom/gmock-port.h +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright 2016 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef THIRD_PARTY_GOOGLETEST_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ -#define THIRD_PARTY_GOOGLETEST_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ - -#include <type_traits> - -namespace std { - -// Provide alternative implementation of std::is_default_constructible for -// old, pre-4.7 of libstdc++, where is_default_constructible is missing. -// <20120322 below implies pre-4.7.0. In addition we blacklist several version -// that released after 4.7.0 from pre-4.7.0 branch. 20120702 implies 4.5.4, and -// 20121127 implies 4.6.4. -#if defined(__GLIBCXX__) && \ - (__GLIBCXX__ < 20120322 || __GLIBCXX__ == 20120702 || \ - __GLIBCXX__ == 20121127) -template <typename T> -using is_default_constructible = std::is_constructible<T>; -#endif -} - -#endif // THIRD_PARTY_GOOGLETEST_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ |