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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: testing/gmock/src/gmock-all.cc

Issue 521012: Update gmock and gtest. (Closed)
Patch Set: update readme Created 11 years 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/scripts/upload_gmock.py ('k') | testing/gmock/src/gmock-internal-utils.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/gmock/src/gmock-all.cc
diff --git a/testing/gmock/src/gmock-all.cc b/testing/gmock/src/gmock-all.cc
index a14c397dcfba50369a02562ce4d611e6595ce1c6..c9223fcee132e6ba55f1fe5e463f66517a11d3ec 100644
--- a/testing/gmock/src/gmock-all.cc
+++ b/testing/gmock/src/gmock-all.cc
@@ -35,6 +35,11 @@
// purpose is to allow a user to build Google Mock by compiling this
// file alone.
+// This line ensures that gmock.h can be compiled on its own, even
+// when it's fused.
+#include <gmock/gmock.h>
+
+// The following lines pull in the real gmock *.cc files.
#include "src/gmock-cardinalities.cc"
#include "src/gmock-internal-utils.cc"
#include "src/gmock-matchers.cc"
« no previous file with comments | « testing/gmock/scripts/upload_gmock.py ('k') | testing/gmock/src/gmock-internal-utils.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698