Pulls in gtest r615.
Renames internal enums to the kFoo naming style.
Fixes gmock doctor to work with newer versions of Clang.
diff --git a/include/gmock/internal/gmock-internal-utils.h b/include/gmock/internal/gmock-internal-utils.h
index aef9388..6b6de97 100644
--- a/include/gmock/internal/gmock-internal-utils.h
+++ b/include/gmock/internal/gmock-internal-utils.h
@@ -260,7 +260,7 @@
public:
// The type of a failure (either non-fatal or fatal).
enum FailureType {
- NONFATAL, FATAL
+ kNonfatal, kFatal
};
virtual ~FailureReporterInterface() {}
@@ -281,7 +281,7 @@
inline void Assert(bool condition, const char* file, int line,
const string& msg) {
if (!condition) {
- GetFailureReporter()->ReportFailure(FailureReporterInterface::FATAL,
+ GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal,
file, line, msg);
}
}
@@ -294,7 +294,7 @@
inline void Expect(bool condition, const char* file, int line,
const string& msg) {
if (!condition) {
- GetFailureReporter()->ReportFailure(FailureReporterInterface::NONFATAL,
+ GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal,
file, line, msg);
}
}
@@ -304,8 +304,8 @@
// Severity level of a log.
enum LogSeverity {
- INFO = 0,
- WARNING = 1
+ kInfo = 0,
+ kWarning = 1
};
// Valid values for the --gmock_verbose flag.