diff options
| author | Andrew Morrow <acm@mongodb.com> | 2017-06-11 13:40:20 -0400 |
|---|---|---|
| committer | Andrew Morrow <acm@mongodb.com> | 2017-06-15 15:53:56 -0400 |
| commit | cf720049672547851498ffbef32b1a19baaf0f11 (patch) | |
| tree | 1098b145c0e62e5643b003af5d84fb3e729bccd2 | |
| parent | 2ac7dedaac717c125f25d797badccd644dc1db00 (diff) | |
| download | mongo-cf720049672547851498ffbef32b1a19baaf0f11.tar.gz | |
SERVER-29552 Complete the assemble_response library
| -rw-r--r-- | src/mongo/SConscript | 1 | ||||
| -rw-r--r-- | src/mongo/db/SConscript | 13 | ||||
| -rw-r--r-- | src/mongo/transport/service_state_machine.cpp | 1 |
3 files changed, 4 insertions, 11 deletions
diff --git a/src/mongo/SConscript b/src/mongo/SConscript index 8cbd53d36c6..b62608ae224 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -281,7 +281,6 @@ mongod = env.Program( "db/mongod_options_init.cpp", ] + env.WindowsResourceFile("db/db.rc"), LIBDEPS=[ - 'db/assemble_response', 'db/commands/core', 'db/conn_pool_options', 'db/catalog/catalog', diff --git a/src/mongo/db/SConscript b/src/mongo/db/SConscript index c7649153f78..8e9054c3cc9 100644 --- a/src/mongo/db/SConscript +++ b/src/mongo/db/SConscript @@ -746,20 +746,16 @@ env.Library( "run_commands.cpp", ], LIBDEPS=[ + "auth/authmongod", + "commands/dcommands_fsync", "curop", "curop_metrics", "diag_log", "lasterror", "ops/write_ops_parsers", + "rw_concern_d", + "s/sharding", "storage/storage_options", - #'introspect', # CYCLE - #'$BUILD_DIR/mongo/db/ops/write_ops', # CYCLE - #'$BUILD_DIR/mongo/db/catalog/catalog', # CYCLE - #'$BUILD_DIR/mongo/db/commands/dcommands_fsync', # CYCLE - ], - LIBDEPS_TAGS=[ - # TODO(ADAM, 2017-05-16): See `CYCLE` tags above - 'illegal_cyclic_or_unresolved_dependencies_whitelisted', ], ) @@ -796,7 +792,6 @@ env.Library( "$BUILD_DIR/mongo/db/storage/mmap_v1/file_allocator", "$BUILD_DIR/third_party/shim_snappy", '$BUILD_DIR/mongo/db/ttl_collection_cache', - "assemble_response", "auth/authmongod", "authz_manager_external_state_factory_d", "background", diff --git a/src/mongo/transport/service_state_machine.cpp b/src/mongo/transport/service_state_machine.cpp index e573dc74ec8..78bf9c495c4 100644 --- a/src/mongo/transport/service_state_machine.cpp +++ b/src/mongo/transport/service_state_machine.cpp @@ -32,7 +32,6 @@ #include "mongo/transport/service_state_machine.h" -#include "mongo/db/assemble_response.h" #include "mongo/db/client.h" #include "mongo/db/dbmessage.h" #include "mongo/stdx/memory.h" |