Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: testing/gmock_custom/gmock/internal/custom/gmock-port.h

Issue 2856383002: Roll googletest to 1.7.0+. (Closed)
Patch Set: Rebase to get past http://crrev.com/2789433004 Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/gmock/include/gmock/gmock-matchers.h ('k') | testing/gtest/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/gmock_custom/gmock/internal/custom/gmock-port.h
diff --git a/testing/gmock_custom/gmock/internal/custom/gmock-port.h b/testing/gmock_custom/gmock/internal/custom/gmock-port.h
deleted file mode 100644
index f8eb6cd416f64b0d9a96d6e39026d30a719e90f7..0000000000000000000000000000000000000000
--- a/testing/gmock_custom/gmock/internal/custom/gmock-port.h
+++ /dev/null
@@ -1,27 +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 TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
-#define TESTING_GMOCK_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 // TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
« no previous file with comments | « testing/gmock/include/gmock/gmock-matchers.h ('k') | testing/gtest/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698