| Index: third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h
|
| diff --git a/testing/gmock_custom/gmock/internal/custom/gmock-port.h b/third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h
|
| similarity index 72%
|
| rename from testing/gmock_custom/gmock/internal/custom/gmock-port.h
|
| rename to third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h
|
| index 1e8d86dbc0b11cc3eb900d979e5bda01c3fcb844..b541499a85d0c00225d2a9c9f3277b43bf489bec 100644
|
| --- a/testing/gmock_custom/gmock/internal/custom/gmock-port.h
|
| +++ b/third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h
|
| @@ -1,9 +1,7 @@
|
| -// Copyright 2016 the V8 project authors. All rights reserved.
|
| +// 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.
|
|
|
| -// Copied from http://crrev.com/6ad76b419eacefc4/testing/gmock_custom/gmock/internal/custom/gmock-port.h
|
| -
|
| #ifndef TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
|
| #define TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
|
|
|
| @@ -16,14 +14,12 @@ namespace std {
|
| // <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)
|
| +#if defined(__GLIBCXX__) && \
|
| + (__GLIBCXX__ < 20120322 || __GLIBCXX__ == 20120702 || \
|
| + __GLIBCXX__ == 20121127)
|
| template <typename T>
|
| using is_default_constructible = std::is_constructible<T>;
|
| #endif
|
| -
|
| }
|
|
|
| #endif // TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
|
|
|