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/db/pipeline | |
| 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/db/pipeline')
| -rw-r--r-- | src/mongo/db/pipeline/SConscript | 2 | ||||
| -rw-r--r-- | src/mongo/db/pipeline/expression.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/mongo/db/pipeline/SConscript b/src/mongo/db/pipeline/SConscript index f03305d8d53..2480340ea2d 100644 --- a/src/mongo/db/pipeline/SConscript +++ b/src/mongo/db/pipeline/SConscript @@ -357,7 +357,7 @@ env.Library( ) pipelineeEnv = env.Clone() -pipelineeEnv.InjectThirdPartyIncludePaths(libraries=['snappy']) +pipelineeEnv.InjectThirdParty(libraries=['snappy']) pipelineeEnv.Library( target='pipeline', source=[ diff --git a/src/mongo/db/pipeline/expression.h b/src/mongo/db/pipeline/expression.h index d02df48f9d7..3e1f1268a57 100644 --- a/src/mongo/db/pipeline/expression.h +++ b/src/mongo/db/pipeline/expression.h @@ -597,10 +597,10 @@ public: * off the timezone if not specified. */ Value serialize(bool explain) const final { + auto timezone = _timeZone ? _timeZone->serialize(explain) : Value(); return Value(Document{ {_opName, - Document{{"date", _date->serialize(explain)}, - {"timezone", _timeZone ? _timeZone->serialize(explain) : Value()}}}}); + Document{{"date", _date->serialize(explain)}, {"timezone", std::move(timezone)}}}}); } boost::intrusive_ptr<Expression> optimize() final { |