From e001158d2da317ae36030cf4919ab8ebb9bdf8b2 Mon Sep 17 00:00:00 2001 From: Adam Midvidy Date: Fri, 6 Nov 2015 11:46:05 -0500 Subject: SERVER-20609 make BSON validation inlineable --- src/mongo/db/ftdc/SConscript | 1 + src/mongo/db/ftdc/decompressor.cpp | 1 + src/mongo/db/ftdc/file_reader.cpp | 1 + src/mongo/db/ftdc/ftdc_test.cpp | 5 ----- 4 files changed, 3 insertions(+), 5 deletions(-) (limited to 'src/mongo/db/ftdc') diff --git a/src/mongo/db/ftdc/SConscript b/src/mongo/db/ftdc/SConscript index b2ff0255bfb..67601b2d3ab 100644 --- a/src/mongo/db/ftdc/SConscript +++ b/src/mongo/db/ftdc/SConscript @@ -21,6 +21,7 @@ ftdcEnv.Library( LIBDEPS=[ '$BUILD_DIR/mongo/base', '$BUILD_DIR/mongo/bson/util/bson_extract', + '$BUILD_DIR/mongo/db/server_options_core', '$BUILD_DIR/mongo/db/service_context', '$BUILD_DIR/third_party/s2/s2', # For VarInt '$BUILD_DIR/third_party/shim_zlib', diff --git a/src/mongo/db/ftdc/decompressor.cpp b/src/mongo/db/ftdc/decompressor.cpp index 622b7bbe831..0ef3f48d467 100644 --- a/src/mongo/db/ftdc/decompressor.cpp +++ b/src/mongo/db/ftdc/decompressor.cpp @@ -36,6 +36,7 @@ #include "mongo/db/ftdc/util.h" #include "mongo/db/ftdc/varint.h" #include "mongo/db/jsobj.h" +#include "mongo/rpc/object_check.h" #include "mongo/util/assert_util.h" namespace mongo { diff --git a/src/mongo/db/ftdc/file_reader.cpp b/src/mongo/db/ftdc/file_reader.cpp index e649a029305..55af92327d5 100644 --- a/src/mongo/db/ftdc/file_reader.cpp +++ b/src/mongo/db/ftdc/file_reader.cpp @@ -39,6 +39,7 @@ #include "mongo/db/ftdc/config.h" #include "mongo/db/ftdc/util.h" #include "mongo/db/jsobj.h" +#include "mongo/rpc/object_check.h" #include "mongo/util/mongoutils/str.h" namespace mongo { diff --git a/src/mongo/db/ftdc/ftdc_test.cpp b/src/mongo/db/ftdc/ftdc_test.cpp index 8538ef6919b..33fcce62eff 100644 --- a/src/mongo/db/ftdc/ftdc_test.cpp +++ b/src/mongo/db/ftdc/ftdc_test.cpp @@ -107,11 +107,6 @@ void createDirectoryClean(const boost::filesystem::path& dir) { boost::filesystem::create_directory(dir); } -template <> -Status Validator::validateLoad(const char* ptr, size_t length) { - return validateBSON(ptr, length); -} - class FTDCClockSourceMock : public ClockSource { Date_t now() final { return Date_t::fromMillisSinceEpoch(37); -- cgit v1.2.1