summaryrefslogtreecommitdiffstats
path: root/googlemock/src
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2018-12-03 16:30:02 (GMT)
committerGennadiy Civil <misterg@google.com>2018-12-03 17:54:11 (GMT)
commit26743363be8f579ee7d637e5b15cbf73e9e18a4a (patch)
treefb89238693dad174c6ddaf57f04bae3c8f41d7fb /googlemock/src
parenta42cdf2abdc0ab7ddfbafc098cafdd6152ae1b70 (diff)
downloadgoogletest-26743363be8f579ee7d637e5b15cbf73e9e18a4a.zip
googletest-26743363be8f579ee7d637e5b15cbf73e9e18a4a.tar.gz
googletest-26743363be8f579ee7d637e5b15cbf73e9e18a4a.tar.bz2
Googletest export
Applied fixes for ClangTidy modernize-use-override and modernize-use-using. PiperOrigin-RevId: 223800219
Diffstat (limited to 'googlemock/src')
-rw-r--r--googlemock/src/gmock-cardinalities.cc10
-rw-r--r--googlemock/src/gmock-internal-utils.cc4
2 files changed, 7 insertions, 7 deletions
diff --git a/googlemock/src/gmock-cardinalities.cc b/googlemock/src/gmock-cardinalities.cc
index 0549f72..7463f43 100644
--- a/googlemock/src/gmock-cardinalities.cc
+++ b/googlemock/src/gmock-cardinalities.cc
@@ -70,18 +70,18 @@ class BetweenCardinalityImpl : public CardinalityInterface {
// Conservative estimate on the lower/upper bound of the number of
// calls allowed.
- virtual int ConservativeLowerBound() const { return min_; }
- virtual int ConservativeUpperBound() const { return max_; }
+ int ConservativeLowerBound() const override { return min_; }
+ int ConservativeUpperBound() const override { return max_; }
- virtual bool IsSatisfiedByCallCount(int call_count) const {
+ bool IsSatisfiedByCallCount(int call_count) const override {
return min_ <= call_count && call_count <= max_;
}
- virtual bool IsSaturatedByCallCount(int call_count) const {
+ bool IsSaturatedByCallCount(int call_count) const override {
return call_count >= max_;
}
- virtual void DescribeTo(::std::ostream* os) const;
+ void DescribeTo(::std::ostream* os) const override;
private:
const int min_;
diff --git a/googlemock/src/gmock-internal-utils.cc b/googlemock/src/gmock-internal-utils.cc
index e3a6748..937d830 100644
--- a/googlemock/src/gmock-internal-utils.cc
+++ b/googlemock/src/gmock-internal-utils.cc
@@ -93,8 +93,8 @@ GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name) {
// use Google Mock with a testing framework other than Google Test.
class GoogleTestFailureReporter : public FailureReporterInterface {
public:
- virtual void ReportFailure(FailureType type, const char* file, int line,
- const std::string& message) {
+ void ReportFailure(FailureType type, const char* file, int line,
+ const std::string& message) override {
AssertHelper(type == kFatal ?
TestPartResult::kFatalFailure :
TestPartResult::kNonFatalFailure,