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

Unified Diff: third_party/googletest/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 | « third_party/googletest/README.chromium ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 84%
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 f8eb6cd416f64b0d9a96d6e39026d30a719e90f7..b541499a85d0c00225d2a9c9f3277b43bf489bec 100644
--- a/testing/gmock_custom/gmock/internal/custom/gmock-port.h
+++ b/third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h
@@ -14,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_
« no previous file with comments | « third_party/googletest/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698