diff options
author | Lingzhi Deng <lingzhi.deng@mongodb.com> | 2020-08-25 21:45:18 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-08-27 15:40:00 +0000 |
commit | d3fedc03bb3b2037bc4f2266b4cd106377c217b7 (patch) | |
tree | 3e4f498a1ba9fca30effb239fadd55bf3fc675e6 /src/mongo/unittest | |
parent | 694ed4153b9d5424b5d169fea5c68f99d4dfb45a (diff) | |
download | mongo-d3fedc03bb3b2037bc4f2266b4cd106377c217b7.tar.gz |
SERVER-50264: Better FCV const correctness
Diffstat (limited to 'src/mongo/unittest')
-rw-r--r-- | src/mongo/unittest/ensure_fcv.h | 4 | ||||
-rw-r--r-- | src/mongo/unittest/unittest.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/unittest/ensure_fcv.h b/src/mongo/unittest/ensure_fcv.h index bcba036e417..a0e6e19ed8d 100644 --- a/src/mongo/unittest/ensure_fcv.h +++ b/src/mongo/unittest/ensure_fcv.h @@ -43,10 +43,10 @@ public: using Version = ServerGlobalParams::FeatureCompatibility::Version; EnsureFCV(Version version) : _origVersion(serverGlobalParams.featureCompatibility.getVersion()) { - serverGlobalParams.featureCompatibility.setVersion(version); + serverGlobalParams.mutableFeatureCompatibility.setVersion(version); } ~EnsureFCV() { - serverGlobalParams.featureCompatibility.setVersion(_origVersion); + serverGlobalParams.mutableFeatureCompatibility.setVersion(_origVersion); } private: diff --git a/src/mongo/unittest/unittest.cpp b/src/mongo/unittest/unittest.cpp index 2e8dafe95c3..0d28c50999e 100644 --- a/src/mongo/unittest/unittest.cpp +++ b/src/mongo/unittest/unittest.cpp @@ -156,11 +156,11 @@ namespace { // with a meaningful value will trigger failures as of SERVER-32630. // (Generic FCV reference): This FCV reference should exist across LTS binary versions. void setUpFCV() { - serverGlobalParams.featureCompatibility.setVersion( + serverGlobalParams.mutableFeatureCompatibility.setVersion( ServerGlobalParams::FeatureCompatibility::kLatest); } void tearDownFCV() { - serverGlobalParams.featureCompatibility.reset(); + serverGlobalParams.mutableFeatureCompatibility.reset(); } struct TestSuiteEnvironment { |