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

Unified Diff: third_party/googletest/custom/gmock/internal/custom/gmock-port.h

Issue 2875143003: Roll googletest to 1.8.0+. (Closed)
Patch Set: Addressed feedback rebased. 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
Index: third_party/googletest/custom/gmock/internal/custom/gmock-port.h
diff --git a/third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h b/third_party/googletest/custom/gmock/internal/custom/gmock-port.h
similarity index 77%
rename from third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h
rename to third_party/googletest/custom/gmock/internal/custom/gmock-port.h
index b541499a85d0c00225d2a9c9f3277b43bf489bec..de84e186b8fa902fdf74265acf091a58676ea4ad 100644
--- a/third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h
+++ b/third_party/googletest/custom/gmock/internal/custom/gmock-port.h
@@ -2,8 +2,8 @@
// 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_
+#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>
@@ -22,4 +22,4 @@ using is_default_constructible = std::is_constructible<T>;
#endif
}
-#endif // TESTING_GMOCK_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
+#endif // THIRD_PARTY_GOOGLETEST_CUSTOM_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_
« no previous file with comments | « third_party/googletest/README.chromium ('k') | third_party/googletest/gmock_custom/gmock/internal/custom/gmock-port.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698