diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2019-01-30 16:52:07 -0500 |
|---|---|---|
| committer | Henrik Edin <henrik.edin@mongodb.com> | 2019-02-01 17:06:10 -0500 |
| commit | 66430d75e33827da60195deb317058c71f75e03f (patch) | |
| tree | 8ca6fcca749a630afca95415638052ed429d2e70 /src/mongo/crypto | |
| parent | 2dc3359cfe83cafa0f450a0dc7e2815f48ad08b4 (diff) | |
| download | mongo-66430d75e33827da60195deb317058c71f75e03f.tar.gz | |
SERVER-38176 Compile with /permissive- on MSVC to make the compiler strictly standard conformant.
Diffstat (limited to 'src/mongo/crypto')
| -rw-r--r-- | src/mongo/crypto/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/crypto/mechanism_scram.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/crypto/SConscript b/src/mongo/crypto/SConscript index ee4c4ff7f03..8f6e35d7b60 100644 --- a/src/mongo/crypto/SConscript +++ b/src/mongo/crypto/SConscript @@ -24,7 +24,7 @@ env.Library('sha256_block', if "tom" in env["MONGO_CRYPTO"]: tomEnv = env.Clone() - tomEnv.InjectThirdPartyIncludePaths(libraries=['tomcrypt']) + tomEnv.InjectThirdParty(libraries=['tomcrypt']) tomEnv.Append( CPPDEFINES=[ 'LTC_NO_PROTOTYPES', diff --git a/src/mongo/crypto/mechanism_scram.h b/src/mongo/crypto/mechanism_scram.h index 2a8cd79e72f..2a8d897f72d 100644 --- a/src/mongo/crypto/mechanism_scram.h +++ b/src/mongo/crypto/mechanism_scram.h @@ -122,7 +122,7 @@ private: return std::tie(_password, _salt, _iterationCount); } - static constexpr auto saltLength() { + static constexpr auto saltLength() -> decltype(HashBlock::kHashLength) { return HashBlock::kHashLength - 4; } |