SERVER-34345 replace ...WITH_VALIDATOR macros to ->withValidator syntax.

    metaprogramming compactness
    mark unused auto pointer
    change is_same value use from {} to ::value

1 files changed, 17 insertions, 19 deletions

diff --git a/src/mongo/rpc/object_check.cpp b/src/mongo/rpc/object_check.cpp
index 37a8a8c77a6..03067d45591 100644
--- a/src/mongo/rpc/object_check.cpp
+++ b/src/mongo/rpc/object_check.cpp
@@ -32,30 +32,28 @@
 #include "mongo/base/status.h"
 #include "mongo/bson/bson_depth.h"
 #include "mongo/db/server_parameters.h"
+#include "mongo/platform/compiler.h"
 #include "mongo/util/stringutils.h"
 
 namespace mongo {
 namespace {
-class MaxBSONDepthParameter
-    : public ExportedServerParameter<std::int32_t, ServerParameterType::kStartupOnly> {
-public:
-    MaxBSONDepthParameter()
-        : ExportedServerParameter<std::int32_t, ServerParameterType::kStartupOnly>(
-              ServerParameterSet::getGlobal(), "maxBSONDepth", &BSONDepth::maxAllowableDepth) {}
 
-    virtual Status validate(const std::int32_t& potentialNewValue) {
-        if (potentialNewValue < BSONDepth::kBSONDepthParameterFloor ||
-            potentialNewValue > BSONDepth::kBSONDepthParameterCeiling) {
-            return Status(ErrorCodes::BadValue,
-                          str::stream() << "maxBSONDepth must be between "
-                                        << BSONDepth::kBSONDepthParameterFloor
-                                        << " and "
-                                        << BSONDepth::kBSONDepthParameterCeiling
-                                        << ", inclusive");
-        }
-        return Status::OK();
-    }
-} maxBSONDepthParameter;
+MONGO_COMPILER_VARIABLE_UNUSED auto _exportedMaxBSONDepth =
+    (new ExportedServerParameter<std::int32_t, ServerParameterType::kStartupOnly>(
+        ServerParameterSet::getGlobal(), "maxBSONDepth", &BSONDepth::maxAllowableDepth))
+        -> withValidator([](const std::int32_t& potentialNewValue) {
+            if (potentialNewValue < BSONDepth::kBSONDepthParameterFloor ||
+                potentialNewValue > BSONDepth::kBSONDepthParameterCeiling) {
+                return Status(ErrorCodes::BadValue,
+                              str::stream() << "maxBSONDepth must be between "
+                                            << BSONDepth::kBSONDepthParameterFloor
+                                            << " and "
+                                            << BSONDepth::kBSONDepthParameterCeiling
+                                            << ", inclusive");
+            }
+            return Status::OK();
+        });
+
 }  // namespace
 
 Status Validator<BSONObj>::validateStore(const BSONObj& toStore) {