SERVER-23548 Remove More VS2013 Workarounds

2 files changed, 2 insertions, 37 deletions

diff --git a/src/mongo/logger/logstream_builder.cpp b/src/mongo/logger/logstream_builder.cpp
index 2577704aad0..69d3e151a47 100644
--- a/src/mongo/logger/logstream_builder.cpp
+++ b/src/mongo/logger/logstream_builder.cpp
@@ -95,29 +95,6 @@ LogstreamBuilder::LogstreamBuilder(logger::MessageLogDomain* domain,
     setBaseMessage(labeledLevel.getLabel());
 }
 
-LogstreamBuilder::LogstreamBuilder(LogstreamBuilder&& other)
-    : _domain(std::move(other._domain)),
-      _contextName(std::move(other._contextName)),
-      _severity(std::move(other._severity)),
-      _component(std::move(other._component)),
-      _baseMessage(std::move(other._baseMessage)),
-      _os(std::move(other._os)),
-      _tee(std::move(other._tee)),
-      _isTruncatable(other._isTruncatable) {}
-
-LogstreamBuilder& LogstreamBuilder::operator=(LogstreamBuilder&& other) {
-    _domain = std::move(other._domain);
-    _contextName = std::move(other._contextName);
-    _severity = std::move(other._severity);
-    _component = std::move(other._component);
-    _baseMessage = std::move(other._baseMessage);
-    _os = std::move(other._os);
-    _tee = std::move(other._tee);
-    _isTruncatable = std::move(other._isTruncatable);
-    return *this;
-}
-
-
 LogstreamBuilder::~LogstreamBuilder() {
     if (_os) {
         if (!_baseMessage.empty())
diff --git a/src/mongo/logger/logstream_builder.h b/src/mongo/logger/logstream_builder.h
index 40f56ccf75f..a8a6890fe38 100644
--- a/src/mongo/logger/logstream_builder.h
+++ b/src/mongo/logger/logstream_builder.h
@@ -85,20 +85,8 @@ public:
                      const std::string& contextName,
                      LabeledLevel labeledLevel);
 
-    /**
-     * Move constructor.
-     *
-     * TODO: Replace with = default implementation when minimum MSVC version is bumped to
-     * MSVC2015.
-     */
-    LogstreamBuilder(LogstreamBuilder&& other);
-
-    /**
-     * Move assignment operator.
-     *
-     * TODO: Replace with =default implementation when minimum MSVC version is bumped to VS2015.
-     */
-    LogstreamBuilder& operator=(LogstreamBuilder&& other);
+    LogstreamBuilder(LogstreamBuilder&& other) = default;
+    LogstreamBuilder& operator=(LogstreamBuilder&& other) = default;
 
     /**
      * Destroys a LogstreamBuilder().  If anything was written to it via stream() or operator<<,