diff options
45 files changed, 58 insertions, 4 deletions
diff --git a/src/mongo/bson/bsonmisc.h b/src/mongo/bson/bsonmisc.h index af96981128e..ca23ab8b24f 100644 --- a/src/mongo/bson/bsonmisc.h +++ b/src/mongo/bson/bsonmisc.h @@ -29,6 +29,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <memory> #include "mongo/bson/bsonelement.h" diff --git a/src/mongo/bson/bsonobjbuilder.h b/src/mongo/bson/bsonobjbuilder.h index cf84f004221..65c2e8f0d66 100644 --- a/src/mongo/bson/bsonobjbuilder.h +++ b/src/mongo/bson/bsonobjbuilder.h @@ -34,6 +34,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/static_assert.hpp> #include <map> #include <cmath> diff --git a/src/mongo/client/connpool.h b/src/mongo/client/connpool.h index f1b7eaf194e..97fb445e336 100644 --- a/src/mongo/client/connpool.h +++ b/src/mongo/client/connpool.h @@ -29,6 +29,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <stack> #include "mongo/client/dbclientinterface.h" diff --git a/src/mongo/client/dbclientcursor.h b/src/mongo/client/dbclientcursor.h index 9aa3815208c..6eb1282a26a 100644 --- a/src/mongo/client/dbclientcursor.h +++ b/src/mongo/client/dbclientcursor.h @@ -29,6 +29,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <stack> #include "mongo/client/dbclientinterface.h" diff --git a/src/mongo/client/dbclientinterface.h b/src/mongo/client/dbclientinterface.h index 645974b37a1..4f63c21db92 100644 --- a/src/mongo/client/dbclientinterface.h +++ b/src/mongo/client/dbclientinterface.h @@ -32,6 +32,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include "mongo/base/string_data.h" diff --git a/src/mongo/db/client.h b/src/mongo/db/client.h index 98b830e7223..dc86d9d8ee9 100644 --- a/src/mongo/db/client.h +++ b/src/mongo/db/client.h @@ -36,6 +36,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include <boost/thread/thread.hpp> diff --git a/src/mongo/db/client_basic.h b/src/mongo/db/client_basic.h index c8a5f611aac..9dd07127e72 100644 --- a/src/mongo/db/client_basic.h +++ b/src/mongo/db/client_basic.h @@ -28,6 +28,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include "mongo/util/net/hostandport.h" diff --git a/src/mongo/db/clientcursor.h b/src/mongo/db/clientcursor.h index 21c08f5f886..5e3803225fc 100644 --- a/src/mongo/db/clientcursor.h +++ b/src/mongo/db/clientcursor.h @@ -28,6 +28,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include <boost/thread/recursive_mutex.hpp> diff --git a/src/mongo/db/commands/mr.h b/src/mongo/db/commands/mr.h index d177d91959e..d7492b986d6 100644 --- a/src/mongo/db/commands/mr.h +++ b/src/mongo/db/commands/mr.h @@ -30,6 +30,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include <string> #include <vector> diff --git a/src/mongo/db/concurrency/d_concurrency.h b/src/mongo/db/concurrency/d_concurrency.h index 09859c1caff..57fdc3f9a8f 100644 --- a/src/mongo/db/concurrency/d_concurrency.h +++ b/src/mongo/db/concurrency/d_concurrency.h @@ -28,6 +28,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include <climits> // For UINT_MAX diff --git a/src/mongo/db/curop.h b/src/mongo/db/curop.h index 00e9af6b549..a8425aece60 100644 --- a/src/mongo/db/curop.h +++ b/src/mongo/db/curop.h @@ -31,6 +31,8 @@ #pragma once +#include <boost/noncopyable.hpp> + #include "mongo/db/client.h" #include "mongo/db/server_options.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/db/dbhelpers.h b/src/mongo/db/dbhelpers.h index 04ac4c611e1..f9ead76bc20 100644 --- a/src/mongo/db/dbhelpers.h +++ b/src/mongo/db/dbhelpers.h @@ -28,6 +28,8 @@ #pragma once +#include <boost/noncopyable.hpp> + #include "mongo/db/client.h" #include "mongo/db/db.h" #include "mongo/db/record_id.h" diff --git a/src/mongo/db/geo/r2_region_coverer.h b/src/mongo/db/geo/r2_region_coverer.h index e95da0228a6..b94c3529a2f 100644 --- a/src/mongo/db/geo/r2_region_coverer.h +++ b/src/mongo/db/geo/r2_region_coverer.h @@ -28,6 +28,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include <queue> diff --git a/src/mongo/db/hasher.h b/src/mongo/db/hasher.h index a19d0de41d1..813b1fc5770 100644 --- a/src/mongo/db/hasher.h +++ b/src/mongo/db/hasher.h @@ -38,6 +38,9 @@ #include "mongo/platform/basic.h" #include "mongo/pch.h" #undef MONGO_PCH_WHITELISTED + +#include <boost/noncopyable.hpp> + #include "mongo/bson/bsonelement.h" #include "mongo/util/md5.hpp" diff --git a/src/mongo/db/lasterror.h b/src/mongo/db/lasterror.h index d1f953734f0..60cd9c1eae2 100644 --- a/src/mongo/db/lasterror.h +++ b/src/mongo/db/lasterror.h @@ -29,6 +29,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/thread/tss.hpp> #include <string> diff --git a/src/mongo/db/pipeline/document.h b/src/mongo/db/pipeline/document.h index 8766ad583f6..51ee3967001 100644 --- a/src/mongo/db/pipeline/document.h +++ b/src/mongo/db/pipeline/document.h @@ -32,6 +32,7 @@ #include <boost/functional/hash.hpp> #include <boost/intrusive_ptr.hpp> +#include <boost/noncopyable.hpp> #include "mongo/bson/util/builder.h" diff --git a/src/mongo/db/pipeline/document_internal.h b/src/mongo/db/pipeline/document_internal.h index 8fcd1d1a8a0..13d76be908e 100644 --- a/src/mongo/db/pipeline/document_internal.h +++ b/src/mongo/db/pipeline/document_internal.h @@ -31,6 +31,7 @@ #include <third_party/murmurhash3/MurmurHash3.h> #include <boost/intrusive_ptr.hpp> +#include <boost/noncopyable.hpp> #include "mongo/util/intrusive_counter.h" #include "mongo/db/pipeline/value.h" diff --git a/src/mongo/db/repl/rs_base.h b/src/mongo/db/repl/rs_base.h index 549fb201d4a..1ba1838ce2b 100644 --- a/src/mongo/db/repl/rs_base.h +++ b/src/mongo/db/repl/rs_base.h @@ -28,6 +28,8 @@ #pragma once +#include <boost/noncopyable.hpp> + #include "mongo/db/repl/health.h" #include "mongo/util/concurrency/mutex.h" diff --git a/src/mongo/db/storage/mmap_v1/dur_commitjob.h b/src/mongo/db/storage/mmap_v1/dur_commitjob.h index cd655b6bd62..b33d60e6e51 100644 --- a/src/mongo/db/storage/mmap_v1/dur_commitjob.h +++ b/src/mongo/db/storage/mmap_v1/dur_commitjob.h @@ -35,6 +35,8 @@ #include "mongo/pch.h" #undef MONGO_PCH_WHITELISTED +#include <boost/noncopyable.hpp> + #include "mongo/db/storage/mmap_v1/dur.h" #include "mongo/db/storage/mmap_v1/durop.h" #include "mongo/util/alignedbuilder.h" diff --git a/src/mongo/db/storage/mmap_v1/dur_recover.cpp b/src/mongo/db/storage/mmap_v1/dur_recover.cpp index 3abf0b6684f..aa1b0db7ad9 100644 --- a/src/mongo/db/storage/mmap_v1/dur_recover.cpp +++ b/src/mongo/db/storage/mmap_v1/dur_recover.cpp @@ -35,6 +35,7 @@ #include "mongo/db/storage/mmap_v1/dur_recover.h" #include <boost/filesystem/operations.hpp> +#include <boost/noncopyable.hpp> #include <fcntl.h> #include <iomanip> #include <iostream> diff --git a/src/mongo/db/storage/mmap_v1/dur_recover.h b/src/mongo/db/storage/mmap_v1/dur_recover.h index b417589f94d..45cf803ff13 100644 --- a/src/mongo/db/storage/mmap_v1/dur_recover.h +++ b/src/mongo/db/storage/mmap_v1/dur_recover.h @@ -31,6 +31,7 @@ #pragma once #include <boost/filesystem/operations.hpp> +#include <boost/noncopyable.hpp> #include <list> #include "mongo/db/storage/mmap_v1/dur_journalformat.h" diff --git a/src/mongo/pch.h b/src/mongo/pch.h index 1bd3827dce4..bed7f13b9c8 100644 --- a/src/mongo/pch.h +++ b/src/mongo/pch.h @@ -51,7 +51,6 @@ #define BOOST_FILESYSTEM_VERSION 3 #include <boost/shared_ptr.hpp> -#include <boost/utility.hpp> #include "mongo/client/redef_macros.h" diff --git a/src/mongo/s/balancer_policy.h b/src/mongo/s/balancer_policy.h index a83328738fc..0d29d5956e2 100644 --- a/src/mongo/s/balancer_policy.h +++ b/src/mongo/s/balancer_policy.h @@ -31,6 +31,8 @@ #ifndef S_BALANCER_POLICY_HEADER #define S_BALANCER_POLICY_HEADER +#include <boost/noncopyable.hpp> + #include "mongo/base/status_with.h" #include "mongo/base/owned_pointer_vector.h" #include "mongo/db/jsobj.h" diff --git a/src/mongo/s/chunk.h b/src/mongo/s/chunk.h index 1ec82d39488..24bbbdc7d74 100644 --- a/src/mongo/s/chunk.h +++ b/src/mongo/s/chunk.h @@ -30,6 +30,8 @@ #pragma once +#include <boost/noncopyable.hpp> + #include "mongo/base/string_data.h" #include "mongo/db/keypattern.h" #include "mongo/db/query/query_solution.h" diff --git a/src/mongo/s/cursors.h b/src/mongo/s/cursors.h index 8269b2def5d..0eb2aa677aa 100644 --- a/src/mongo/s/cursors.h +++ b/src/mongo/s/cursors.h @@ -35,6 +35,7 @@ #include "mongo/pch.h" #undef MONGO_PCH_WHITELISTED +#include <boost/noncopyable.hpp> #include <string> #include "mongo/client/parallel.h" diff --git a/src/mongo/s/request.h b/src/mongo/s/request.h index 2e85582dadd..875bd848a24 100644 --- a/src/mongo/s/request.h +++ b/src/mongo/s/request.h @@ -35,6 +35,7 @@ #include "mongo/pch.h" #undef MONGO_PCH_WHITELISTED +#include <boost/noncopyable.hpp> #include <boost/scoped_ptr.hpp> #include "mongo/db/dbmessage.h" diff --git a/src/mongo/s/shardconnection.cpp b/src/mongo/s/shardconnection.cpp index 543ee9ee7fb..2ba89122092 100644 --- a/src/mongo/s/shardconnection.cpp +++ b/src/mongo/s/shardconnection.cpp @@ -35,6 +35,7 @@ #include "mongo/pch.h" #undef MONGO_PCH_WHITELISTED +#include <boost/noncopyable.hpp> #include <set> #include "mongo/db/auth/authorization_manager.h" diff --git a/src/mongo/shell/bench.cpp b/src/mongo/shell/bench.cpp index bd55346d6cf..a287b8dd01c 100644 --- a/src/mongo/shell/bench.cpp +++ b/src/mongo/shell/bench.cpp @@ -36,6 +36,7 @@ #include <pcrecpp.h> +#include <boost/noncopyable.hpp> #include <boost/thread/thread.hpp> #include <iostream> diff --git a/src/mongo/shell/bench.h b/src/mongo/shell/bench.h index 4f2490617fe..f7a58799465 100644 --- a/src/mongo/shell/bench.h +++ b/src/mongo/shell/bench.h @@ -33,6 +33,7 @@ #include <boost/scoped_ptr.hpp> #include <boost/shared_ptr.hpp> #include <boost/thread/condition.hpp> +#include <boost/noncopyable.hpp> #include <boost/thread/mutex.hpp> #include "mongo/client/dbclientinterface.h" diff --git a/src/mongo/util/background.h b/src/mongo/util/background.h index fa6a55f5a6a..4f8ae23ee57 100644 --- a/src/mongo/util/background.h +++ b/src/mongo/util/background.h @@ -30,7 +30,7 @@ #pragma once #include <boost/scoped_ptr.hpp> -#include <boost/utility.hpp> +#include <boost/noncopyable.hpp> #include <string> #include <vector> diff --git a/src/mongo/util/concurrency/mapsf.h b/src/mongo/util/concurrency/mapsf.h index b57caf6bbbb..190cc3b506e 100644 --- a/src/mongo/util/concurrency/mapsf.h +++ b/src/mongo/util/concurrency/mapsf.h @@ -28,6 +28,8 @@ * then also delete it in the license file. */ +#include <boost/noncopyable.hpp> + #include "mongo/platform/unordered_map.h" namespace mongo { diff --git a/src/mongo/util/concurrency/rwlock.h b/src/mongo/util/concurrency/rwlock.h index edb76e1d5ea..34f2a95eb5f 100644 --- a/src/mongo/util/concurrency/rwlock.h +++ b/src/mongo/util/concurrency/rwlock.h @@ -30,6 +30,8 @@ #pragma once +#include <boost/noncopyable.hpp> + #include "mongo/util/concurrency/mutex.h" #include "mongo/util/concurrency/rwlockimpl.h" #include "mongo/util/concurrency/simplerwlock.h" diff --git a/src/mongo/util/concurrency/shared_mutex_win.hpp b/src/mongo/util/concurrency/shared_mutex_win.hpp index e850fc6bab4..ab0f9f1b3f9 100644 --- a/src/mongo/util/concurrency/shared_mutex_win.hpp +++ b/src/mongo/util/concurrency/shared_mutex_win.hpp @@ -35,10 +35,10 @@ #include <boost/assert.hpp>
#include <boost/detail/interlocked.hpp>
+#include <boost/noncopyable.hpp>
#include <boost/thread/win32/thread_primitives.hpp>
#include <boost/static_assert.hpp>
#include <limits.h>
-#include <boost/utility.hpp>
#include <boost/thread/thread_time.hpp>
#include <boost/config/abi_prefix.hpp>
diff --git a/src/mongo/util/concurrency/simplerwlock.h b/src/mongo/util/concurrency/simplerwlock.h index b267b03e7c2..320a91c6e56 100644 --- a/src/mongo/util/concurrency/simplerwlock.h +++ b/src/mongo/util/concurrency/simplerwlock.h @@ -28,6 +28,8 @@ #pragma once +#include <boost/noncopyable.hpp> + #include "mongo/base/string_data.h" #include "mongo/platform/atomic_word.h" diff --git a/src/mongo/util/concurrency/spin_lock.h b/src/mongo/util/concurrency/spin_lock.h index 4f22f958683..2343fdc461a 100644 --- a/src/mongo/util/concurrency/spin_lock.h +++ b/src/mongo/util/concurrency/spin_lock.h @@ -34,6 +34,8 @@ #include "mongo/platform/windows_basic.h" #endif +#include <boost/noncopyable.hpp> + #include "mutex.h" namespace mongo { diff --git a/src/mongo/util/concurrency/synchronization.h b/src/mongo/util/concurrency/synchronization.h index e83063b1a1b..7446817c309 100644 --- a/src/mongo/util/concurrency/synchronization.h +++ b/src/mongo/util/concurrency/synchronization.h @@ -30,6 +30,8 @@ #pragma once #include <boost/thread/condition.hpp> +#include <boost/noncopyable.hpp> + #include "mutex.h" namespace mongo { diff --git a/src/mongo/util/concurrency/thread_pool.cpp b/src/mongo/util/concurrency/thread_pool.cpp index 408335ef9a7..137b7d6f3a5 100644 --- a/src/mongo/util/concurrency/thread_pool.cpp +++ b/src/mongo/util/concurrency/thread_pool.cpp @@ -37,6 +37,7 @@ #include "mongo/util/concurrency/thread_pool.h" +#include <boost/noncopyable.hpp> #include <boost/thread/thread.hpp> #include "mongo/util/concurrency/mvar.h" diff --git a/src/mongo/util/concurrency/thread_pool.h b/src/mongo/util/concurrency/thread_pool.h index c454b18cba7..4ca05375971 100644 --- a/src/mongo/util/concurrency/thread_pool.h +++ b/src/mongo/util/concurrency/thread_pool.h @@ -31,6 +31,7 @@ #include <list> +#include <boost/noncopyable.hpp> #include <boost/thread/condition.hpp> #include "mongo/stdx/functional.h" diff --git a/src/mongo/util/file_allocator.h b/src/mongo/util/file_allocator.h index 50f4d023a6d..b5fd36619a1 100644 --- a/src/mongo/util/file_allocator.h +++ b/src/mongo/util/file_allocator.h @@ -34,6 +34,7 @@ #include <list> #include <boost/filesystem/path.hpp> +#include <boost/noncopyable.hpp> #include <boost/thread/condition.hpp> #include "mongo/util/concurrency/mutex.h" diff --git a/src/mongo/util/mmap.h b/src/mongo/util/mmap.h index 09896c53455..efadd91b124 100644 --- a/src/mongo/util/mmap.h +++ b/src/mongo/util/mmap.h @@ -33,6 +33,7 @@ #include <sstream> #include <vector> +#include <boost/noncopyable.hpp> #include <boost/thread/xtime.hpp> #include "mongo/client/export_macros.h" diff --git a/src/mongo/util/net/httpclient.h b/src/mongo/util/net/httpclient.h index 233c0ba9e67..1d48875f44f 100644 --- a/src/mongo/util/net/httpclient.h +++ b/src/mongo/util/net/httpclient.h @@ -35,6 +35,8 @@ #include "mongo/pch.h" #undef MONGO_PCH_WHITELISTED +#include <boost/noncopyable.hpp> + namespace mongo { class MONGO_CLIENT_API HttpClient : boost::noncopyable { diff --git a/src/mongo/util/net/listen.h b/src/mongo/util/net/listen.h index cf0cf965092..d5b3fc36aa6 100644 --- a/src/mongo/util/net/listen.h +++ b/src/mongo/util/net/listen.h @@ -29,6 +29,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/thread/mutex.hpp> #include <boost/thread/condition_variable.hpp> #include <set> diff --git a/src/mongo/util/net/message_port.h b/src/mongo/util/net/message_port.h index fe3eefbd5e5..ee64a7a7584 100644 --- a/src/mongo/util/net/message_port.h +++ b/src/mongo/util/net/message_port.h @@ -29,6 +29,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <vector> #include "mongo/util/net/message.h" diff --git a/src/mongo/util/queue.h b/src/mongo/util/queue.h index a087635d6fa..5f87256657f 100644 --- a/src/mongo/util/queue.h +++ b/src/mongo/util/queue.h @@ -29,6 +29,7 @@ #pragma once +#include <boost/noncopyable.hpp> #include <boost/thread/condition.hpp> #include <limits> #include <queue> diff --git a/src/mongo/util/thread_safe_string.h b/src/mongo/util/thread_safe_string.h index dad3edcfe28..e80ea305e7c 100644 --- a/src/mongo/util/thread_safe_string.h +++ b/src/mongo/util/thread_safe_string.h @@ -32,7 +32,7 @@ #include <iosfwd> #include <string> -#include <boost/utility.hpp> +#include <boost/noncopyable.hpp> #include "mongo/base/string_data.h" |