diff options
60 files changed, 82 insertions, 65 deletions
diff --git a/src/mongo/base/counter.h b/src/mongo/base/counter.h index b8089f1c002..fad095fc385 100644 --- a/src/mongo/base/counter.h +++ b/src/mongo/base/counter.h @@ -30,8 +30,9 @@ #pragma once +#include <cstdint> + #include "mongo/platform/atomic_word.h" -#include "mongo/platform/cstdint.h" namespace mongo { /** diff --git a/src/mongo/base/parse_number.cpp b/src/mongo/base/parse_number.cpp index 6e67645a6f0..7aa112f08be 100644 --- a/src/mongo/base/parse_number.cpp +++ b/src/mongo/base/parse_number.cpp @@ -31,12 +31,11 @@ #include <algorithm> #include <cerrno> +#include <cstdint> #include <cstdlib> #include <limits> #include <string> -#include "mongo/platform/cstdint.h" - namespace mongo { /** diff --git a/src/mongo/base/parse_number_test.cpp b/src/mongo/base/parse_number_test.cpp index 75f5fd82f15..01522ad517b 100644 --- a/src/mongo/base/parse_number_test.cpp +++ b/src/mongo/base/parse_number_test.cpp @@ -29,11 +29,11 @@ #include "mongo/platform/basic.h" #include <cmath> +#include <cstdint> #include <limits> #include "mongo/base/parse_number.h" #include "mongo/base/status.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/mongoutils/str.h" // for str::stream()! #include "mongo/unittest/unittest.h" diff --git a/src/mongo/bson/bson_validate.h b/src/mongo/bson/bson_validate.h index 1a55a09e6b6..5497f4c8d82 100644 --- a/src/mongo/bson/bson_validate.h +++ b/src/mongo/bson/bson_validate.h @@ -29,9 +29,10 @@ #pragma once +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/bson/bsontypes.h" -#include "mongo/platform/cstdint.h" namespace mongo { class BSONObj; diff --git a/src/mongo/bson/bsonelement.h b/src/mongo/bson/bsonelement.h index 92ddf87600a..f2fc5416785 100644 --- a/src/mongo/bson/bsonelement.h +++ b/src/mongo/bson/bsonelement.h @@ -30,6 +30,7 @@ #pragma once #include <cmath> +#include <cstdint> #include <string.h> // strlen #include <string> #include <vector> @@ -39,7 +40,6 @@ #include "mongo/bson/bsontypes.h" #include "mongo/bson/oid.h" #include "mongo/bson/timestamp.h" -#include "mongo/platform/cstdint.h" namespace mongo { class BSONObj; diff --git a/src/mongo/bson/json.cpp b/src/mongo/bson/json.cpp index 5e74b9d9a16..d318a9bc0e8 100644 --- a/src/mongo/bson/json.cpp +++ b/src/mongo/bson/json.cpp @@ -29,10 +29,10 @@ #include "mongo/bson/json.h" +#include <cstdint> #include "mongo/base/parse_number.h" #include "mongo/db/jsobj.h" -#include "mongo/platform/cstdint.h" #include "mongo/platform/strtoll.h" #include "mongo/util/base64.h" #include "mongo/util/hex.h" diff --git a/src/mongo/bson/mutable/damage_vector.h b/src/mongo/bson/mutable/damage_vector.h index 1072b4f7ec4..0e0469bb8f2 100644 --- a/src/mongo/bson/mutable/damage_vector.h +++ b/src/mongo/bson/mutable/damage_vector.h @@ -27,10 +27,9 @@ #pragma once +#include <cstdint> #include <vector> -#include "mongo/platform/cstdint.h" - namespace mongo { namespace mutablebson { diff --git a/src/mongo/bson/mutable/document.h b/src/mongo/bson/mutable/document.h index 30c79f1552b..3a24eac74cc 100644 --- a/src/mongo/bson/mutable/document.h +++ b/src/mongo/bson/mutable/document.h @@ -27,6 +27,7 @@ #pragma once +#include <cstdint> #include "mongo/base/disallow_copying.h" #include "mongo/base/string_data.h" @@ -34,7 +35,6 @@ #include "mongo/bson/mutable/damage_vector.h" #include "mongo/bson/mutable/element.h" #include "mongo/db/jsobj.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/safe_num.h" namespace mongo { diff --git a/src/mongo/bson/mutable/element.h b/src/mongo/bson/mutable/element.h index 50df2e1b620..673180c0c64 100644 --- a/src/mongo/bson/mutable/element.h +++ b/src/mongo/bson/mutable/element.h @@ -27,10 +27,11 @@ #pragma once +#include <cstdint> + #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/db/jsobj.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/safe_num.h" namespace mongo { diff --git a/src/mongo/bson/timestamp.cpp b/src/mongo/bson/timestamp.cpp index 68d63d63e3f..299fd87045f 100644 --- a/src/mongo/bson/timestamp.cpp +++ b/src/mongo/bson/timestamp.cpp @@ -28,12 +28,12 @@ #include "mongo/bson/bsontypes.h" #include "mongo/bson/timestamp.h" +#include <cstdint> #include <ctime> #include <iostream> #include <limits> #include <sstream> -#include "mongo/platform/cstdint.h" #include "mongo/util/time_support.h" namespace mongo { diff --git a/src/mongo/client/connpool.h b/src/mongo/client/connpool.h index 04beed0d33d..a9f494d7279 100644 --- a/src/mongo/client/connpool.h +++ b/src/mongo/client/connpool.h @@ -29,11 +29,11 @@ #pragma once +#include <cstdint> #include <stack> #include "mongo/client/dbclientinterface.h" #include "mongo/platform/atomic_word.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/background.h" #include "mongo/util/concurrency/mutex.h" diff --git a/src/mongo/client/dbclientinterface.h b/src/mongo/client/dbclientinterface.h index 7db99d0a096..71aa925f832 100644 --- a/src/mongo/client/dbclientinterface.h +++ b/src/mongo/client/dbclientinterface.h @@ -28,12 +28,13 @@ #pragma once +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/client/connection_string.h" #include "mongo/client/read_preference.h" #include "mongo/db/jsobj.h" #include "mongo/platform/atomic_word.h" -#include "mongo/platform/cstdint.h" #include "mongo/rpc/protocol.h" #include "mongo/rpc/metadata.h" #include "mongo/rpc/unique_message.h" diff --git a/src/mongo/client/replica_set_monitor_internal.h b/src/mongo/client/replica_set_monitor_internal.h index e6b8ac54418..cb561fadd85 100644 --- a/src/mongo/client/replica_set_monitor_internal.h +++ b/src/mongo/client/replica_set_monitor_internal.h @@ -33,6 +33,7 @@ #pragma once +#include <cstdint> #include <deque> #include <set> #include <string> @@ -42,7 +43,6 @@ #include "mongo/client/read_preference.h" #include "mongo/client/replica_set_monitor.h" #include "mongo/db/jsobj.h" -#include "mongo/platform/cstdint.h" #include "mongo/platform/random.h" #include "mongo/stdx/condition_variable.h" #include "mongo/util/net/hostandport.h" diff --git a/src/mongo/client/sasl_client_authenticate_impl.cpp b/src/mongo/client/sasl_client_authenticate_impl.cpp index 5cc5df37555..cde6787cebb 100644 --- a/src/mongo/client/sasl_client_authenticate_impl.cpp +++ b/src/mongo/client/sasl_client_authenticate_impl.cpp @@ -36,6 +36,7 @@ #include "mongo/platform/basic.h" +#include <cstdint> #include <string> #include "mongo/base/init.h" @@ -44,7 +45,6 @@ #include "mongo/bson/util/bson_extract.h" #include "mongo/client/sasl_client_authenticate.h" #include "mongo/client/sasl_client_session.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/base64.h" #include "mongo/util/log.h" #include "mongo/util/mongoutils/str.h" diff --git a/src/mongo/db/auth/native_sasl_authentication_session.h b/src/mongo/db/auth/native_sasl_authentication_session.h index 156ffe685f3..3688a4aad31 100644 --- a/src/mongo/db/auth/native_sasl_authentication_session.h +++ b/src/mongo/db/auth/native_sasl_authentication_session.h @@ -28,13 +28,13 @@ #pragma once +#include <cstdint> #include <string> #include "mongo/base/disallow_copying.h" #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/db/auth/authentication_session.h" -#include "mongo/platform/cstdint.h" #include "mongo/db/auth/sasl_authentication_session.h" #include "mongo/db/auth/sasl_server_conversation.h" diff --git a/src/mongo/db/auth/sasl_authentication_session.h b/src/mongo/db/auth/sasl_authentication_session.h index ac298dbede6..6d3aff00358 100644 --- a/src/mongo/db/auth/sasl_authentication_session.h +++ b/src/mongo/db/auth/sasl_authentication_session.h @@ -28,6 +28,7 @@ #pragma once +#include <cstdint> #include <string> #include <vector> @@ -36,7 +37,6 @@ #include "mongo/base/string_data.h" #include "mongo/db/auth/authentication_session.h" #include "mongo/db/auth/authorization_session.h" -#include "mongo/platform/cstdint.h" #include "mongo/stdx/functional.h" namespace mongo { diff --git a/src/mongo/db/catalog/collection.h b/src/mongo/db/catalog/collection.h index 972979378cf..02efe72ec2a 100644 --- a/src/mongo/db/catalog/collection.h +++ b/src/mongo/db/catalog/collection.h @@ -30,6 +30,7 @@ #pragma once +#include <cstdint> #include <memory> #include <string> @@ -47,7 +48,6 @@ #include "mongo/db/storage/capped_callback.h" #include "mongo/db/storage/record_store.h" #include "mongo/db/storage/snapshot.h" -#include "mongo/platform/cstdint.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/concurrency/lock_manager.h b/src/mongo/db/concurrency/lock_manager.h index 991768f54c4..a7e65ac9189 100644 --- a/src/mongo/db/concurrency/lock_manager.h +++ b/src/mongo/db/concurrency/lock_manager.h @@ -28,6 +28,7 @@ #pragma once +#include <cstdint> #include <deque> #include "mongo/config.h" @@ -35,7 +36,6 @@ #include "mongo/db/concurrency/lock_request_list.h" #include "mongo/platform/atomic_word.h" #include "mongo/platform/compiler.h" -#include "mongo/platform/cstdint.h" #include "mongo/platform/unordered_map.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/mutex.h" diff --git a/src/mongo/db/concurrency/lock_manager_defs.h b/src/mongo/db/concurrency/lock_manager_defs.h index 2f93a4ca017..63c3e6ebf50 100644 --- a/src/mongo/db/concurrency/lock_manager_defs.h +++ b/src/mongo/db/concurrency/lock_manager_defs.h @@ -29,12 +29,12 @@ #pragma once #include <boost/static_assert.hpp> +#include <cstdint> #include <string> #include <limits> #include "mongo/base/string_data.h" #include "mongo/config.h" -#include "mongo/platform/cstdint.h" #include "mongo/platform/hash_namespace.h" namespace mongo { diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h index c3b514260a3..2c66370fb5f 100644 --- a/src/mongo/db/exec/plan_stats.h +++ b/src/mongo/db/exec/plan_stats.h @@ -28,6 +28,7 @@ #pragma once +#include <cstdint> #include <cstdlib> #include <string> #include <vector> @@ -35,7 +36,6 @@ #include "mongo/base/disallow_copying.h" #include "mongo/db/jsobj.h" #include "mongo/db/query/stage_types.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/time_support.h" #include "mongo/util/net/listen.h" // for Listener::getElapsedTimeMillis() diff --git a/src/mongo/db/matcher/path_internal.h b/src/mongo/db/matcher/path_internal.h index 9d44d1877f1..2f7951dcc3e 100644 --- a/src/mongo/db/matcher/path_internal.h +++ b/src/mongo/db/matcher/path_internal.h @@ -30,10 +30,11 @@ #pragma once +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/db/field_ref.h" #include "mongo/db/jsobj.h" -#include "mongo/platform/cstdint.h" namespace mongo { diff --git a/src/mongo/db/ops/modifier_add_to_set_test.cpp b/src/mongo/db/ops/modifier_add_to_set_test.cpp index 43335cb4847..698fb0c411f 100644 --- a/src/mongo/db/ops/modifier_add_to_set_test.cpp +++ b/src/mongo/db/ops/modifier_add_to_set_test.cpp @@ -29,13 +29,14 @@ #include "mongo/db/ops/modifier_add_to_set.h" +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/bson/mutable/document.h" #include "mongo/bson/mutable/mutable_bson_test_utils.h" #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_bit_test.cpp b/src/mongo/db/ops/modifier_bit_test.cpp index 59e13f89e24..b6a4fb38a7b 100644 --- a/src/mongo/db/ops/modifier_bit_test.cpp +++ b/src/mongo/db/ops/modifier_bit_test.cpp @@ -29,13 +29,14 @@ #include "mongo/db/ops/modifier_bit.h" +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/bson/mutable/document.h" #include "mongo/bson/mutable/mutable_bson_test_utils.h" #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_compare_test.cpp b/src/mongo/db/ops/modifier_compare_test.cpp index fb6bcf8d84f..238c19b905a 100644 --- a/src/mongo/db/ops/modifier_compare_test.cpp +++ b/src/mongo/db/ops/modifier_compare_test.cpp @@ -28,13 +28,14 @@ #include "mongo/db/ops/modifier_compare.h" +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/bson/mutable/document.h" #include "mongo/bson/mutable/mutable_bson_test_utils.h" #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_current_date_test.cpp b/src/mongo/db/ops/modifier_current_date_test.cpp index ecb4b86bac8..126b983adbc 100644 --- a/src/mongo/db/ops/modifier_current_date_test.cpp +++ b/src/mongo/db/ops/modifier_current_date_test.cpp @@ -28,13 +28,14 @@ #include "mongo/db/ops/modifier_current_date.h" +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/bson/mutable/document.h" #include "mongo/bson/mutable/mutable_bson_test_utils.h" #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_inc_test.cpp b/src/mongo/db/ops/modifier_inc_test.cpp index 52ab8d0e41c..6a0e3a332bd 100644 --- a/src/mongo/db/ops/modifier_inc_test.cpp +++ b/src/mongo/db/ops/modifier_inc_test.cpp @@ -29,6 +29,8 @@ #include "mongo/db/ops/modifier_inc.h" +#include <cstdint> + #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/mutable/algorithm.h" @@ -37,7 +39,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_object_replace_test.cpp b/src/mongo/db/ops/modifier_object_replace_test.cpp index 083981fb34f..4f55fe2cbf4 100644 --- a/src/mongo/db/ops/modifier_object_replace_test.cpp +++ b/src/mongo/db/ops/modifier_object_replace_test.cpp @@ -29,6 +29,8 @@ #include "mongo/db/ops/modifier_object_replace.h" +#include <cstdint> + #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/mutable/algorithm.h" @@ -38,7 +40,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_pop_test.cpp b/src/mongo/db/ops/modifier_pop_test.cpp index 373c61aeca6..06dd60a029e 100644 --- a/src/mongo/db/ops/modifier_pop_test.cpp +++ b/src/mongo/db/ops/modifier_pop_test.cpp @@ -29,6 +29,8 @@ #include "mongo/db/ops/modifier_pop.h" +#include <cstdint> + #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/mutable/algorithm.h" @@ -37,7 +39,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/ops/log_builder.h" #include "mongo/db/json.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_pull_all_test.cpp b/src/mongo/db/ops/modifier_pull_all_test.cpp index 4b22f4d97a8..009e02ac148 100644 --- a/src/mongo/db/ops/modifier_pull_all_test.cpp +++ b/src/mongo/db/ops/modifier_pull_all_test.cpp @@ -29,6 +29,8 @@ #include "mongo/db/ops/modifier_pull_all.h" +#include <cstdint> + #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/mutable/algorithm.h" @@ -37,7 +39,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_pull_test.cpp b/src/mongo/db/ops/modifier_pull_test.cpp index 8862ac62575..279aa0101c8 100644 --- a/src/mongo/db/ops/modifier_pull_test.cpp +++ b/src/mongo/db/ops/modifier_pull_test.cpp @@ -29,13 +29,14 @@ #include "mongo/db/ops/modifier_pull.h" +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/bson/mutable/document.h" #include "mongo/bson/mutable/mutable_bson_test_utils.h" #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_push_test.cpp b/src/mongo/db/ops/modifier_push_test.cpp index 275e1a4945e..43a18a44ef9 100644 --- a/src/mongo/db/ops/modifier_push_test.cpp +++ b/src/mongo/db/ops/modifier_push_test.cpp @@ -29,6 +29,7 @@ #include "mongo/db/ops/modifier_push.h" #include <algorithm> +#include <cstdint> #include <iostream> #include <vector> @@ -41,7 +42,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" #include "mongo/util/mongoutils/str.h" diff --git a/src/mongo/db/ops/modifier_rename_test.cpp b/src/mongo/db/ops/modifier_rename_test.cpp index 4841c4b15a1..db03531d4b4 100644 --- a/src/mongo/db/ops/modifier_rename_test.cpp +++ b/src/mongo/db/ops/modifier_rename_test.cpp @@ -28,6 +28,8 @@ #include "mongo/db/ops/modifier_rename.h" +#include <cstdint> + #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/mutable/algorithm.h" @@ -36,7 +38,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_set_test.cpp b/src/mongo/db/ops/modifier_set_test.cpp index 315da4e113d..76dbbeae0e8 100644 --- a/src/mongo/db/ops/modifier_set_test.cpp +++ b/src/mongo/db/ops/modifier_set_test.cpp @@ -29,6 +29,8 @@ #include "mongo/db/ops/modifier_set.h" +#include <cstdint> + #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/mutable/algorithm.h" @@ -37,7 +39,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/modifier_unset_test.cpp b/src/mongo/db/ops/modifier_unset_test.cpp index d68f471c7e7..af6ad9581a7 100644 --- a/src/mongo/db/ops/modifier_unset_test.cpp +++ b/src/mongo/db/ops/modifier_unset_test.cpp @@ -29,6 +29,8 @@ #include "mongo/db/ops/modifier_unset.h" +#include <cstdint> + #include "mongo/base/status.h" #include "mongo/base/string_data.h" #include "mongo/bson/mutable/algorithm.h" @@ -37,7 +39,6 @@ #include "mongo/db/jsobj.h" #include "mongo/db/json.h" #include "mongo/db/ops/log_builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/db/ops/path_support.h b/src/mongo/db/ops/path_support.h index 95d0a3da44c..6e01c03390e 100644 --- a/src/mongo/db/ops/path_support.h +++ b/src/mongo/db/ops/path_support.h @@ -28,6 +28,7 @@ #pragma once +#include <cstdint> #include <string> #include "mongo/base/status.h" @@ -36,7 +37,6 @@ #include "mongo/db/field_ref_set.h" #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_leaf.h" -#include "mongo/platform/cstdint.h" namespace mongo { diff --git a/src/mongo/db/ops/path_support_test.cpp b/src/mongo/db/ops/path_support_test.cpp index 62e6ded46c2..d3969c54fb1 100644 --- a/src/mongo/db/ops/path_support_test.cpp +++ b/src/mongo/db/ops/path_support_test.cpp @@ -28,6 +28,7 @@ #include "mongo/db/ops/path_support.h" +#include <cstdint> #include <string> #include "mongo/base/error_codes.h" @@ -43,7 +44,6 @@ #include "mongo/db/matcher/expression.h" #include "mongo/db/matcher/expression_leaf.h" #include "mongo/db/matcher/expression_parser.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" #include "mongo/util/mongoutils/str.h" diff --git a/src/mongo/db/record_id.h b/src/mongo/db/record_id.h index cd7e8025b90..1ebea7ee122 100644 --- a/src/mongo/db/record_id.h +++ b/src/mongo/db/record_id.h @@ -31,12 +31,12 @@ #include <boost/functional/hash.hpp> #include <boost/optional.hpp> #include <climits> +#include <cstdint> #include <ostream> #include "mongo/bson/util/builder.h" #include "mongo/logger/logstream_builder.h" #include "mongo/util/bufreader.h" -#include "mongo/platform/cstdint.h" namespace mongo { diff --git a/src/mongo/db/repl/replica_set_tag.h b/src/mongo/db/repl/replica_set_tag.h index 4227ec56956..beee7e70ab4 100644 --- a/src/mongo/db/repl/replica_set_tag.h +++ b/src/mongo/db/repl/replica_set_tag.h @@ -28,6 +28,7 @@ #pragma once +#include <cstdint> #include <iosfwd> #include <string> #include <utility> @@ -35,7 +36,6 @@ #include "mongo/base/status.h" #include "mongo/base/string_data.h" -#include "mongo/platform/cstdint.h" namespace mongo { class BSONObjBuilder; diff --git a/src/mongo/db/storage/mmap_v1/diskloc.h b/src/mongo/db/storage/mmap_v1/diskloc.h index 5a675b40b92..8d20056ae56 100644 --- a/src/mongo/db/storage/mmap_v1/diskloc.h +++ b/src/mongo/db/storage/mmap_v1/diskloc.h @@ -35,10 +35,10 @@ #pragma once #include <boost/functional/hash.hpp> +#include <cstdint> #include "mongo/db/jsobj.h" #include "mongo/db/record_id.h" -#include "mongo/platform/cstdint.h" #include "mongo/platform/unordered_set.h" namespace mongo { diff --git a/src/mongo/db/storage/recovery_unit.h b/src/mongo/db/storage/recovery_unit.h index d671516fcbd..ee6c7ba5eaf 100644 --- a/src/mongo/db/storage/recovery_unit.h +++ b/src/mongo/db/storage/recovery_unit.h @@ -28,12 +28,12 @@ #pragma once +#include <cstdint> #include <stdlib.h> #include <string> #include "mongo/base/disallow_copying.h" #include "mongo/db/storage/snapshot.h" -#include "mongo/platform/cstdint.h" namespace mongo { diff --git a/src/mongo/dbtests/indexupdatetests.cpp b/src/mongo/dbtests/indexupdatetests.cpp index 8b00af6a375..0fd22937157 100644 --- a/src/mongo/dbtests/indexupdatetests.cpp +++ b/src/mongo/dbtests/indexupdatetests.cpp @@ -28,6 +28,7 @@ * then also delete it in the license file. */ +#include <cstdint> #include "mongo/db/catalog/collection.h" #include "mongo/db/catalog/index_catalog.h" @@ -40,7 +41,6 @@ #include "mongo/db/index/index_descriptor.h" #include "mongo/db/operation_context_impl.h" #include "mongo/dbtests/dbtests.h" -#include "mongo/platform/cstdint.h" namespace IndexUpdateTests { diff --git a/src/mongo/logger/message_event.h b/src/mongo/logger/message_event.h index 573a6cd3e05..331e46282eb 100644 --- a/src/mongo/logger/message_event.h +++ b/src/mongo/logger/message_event.h @@ -27,10 +27,11 @@ #pragma once +#include <cstdint> + #include "mongo/base/string_data.h" #include "mongo/logger/log_component.h" #include "mongo/logger/log_severity.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/time_support.h" namespace mongo { diff --git a/src/mongo/platform/endian.h b/src/mongo/platform/endian.h index 083fcda3a3c..cb8e997d125 100644 --- a/src/mongo/platform/endian.h +++ b/src/mongo/platform/endian.h @@ -27,14 +27,14 @@ #pragma once -#include <climits> -#include <cstring> #include <boost/static_assert.hpp> #include <boost/mpl/if.hpp> #include <boost/type_traits/is_signed.hpp> +#include <climits> +#include <cstdint> +#include <cstring> #include "mongo/config.h" -#include "mongo/platform/cstdint.h" #pragma push_macro("MONGO_UINT16_SWAB") #pragma push_macro("MONGO_UINT32_SWAB") diff --git a/src/mongo/platform/process_id.h b/src/mongo/platform/process_id.h index d566e985be1..acb123d849d 100644 --- a/src/mongo/platform/process_id.h +++ b/src/mongo/platform/process_id.h @@ -27,6 +27,7 @@ #pragma once +#include <cstdint> #include <iosfwd> #include <string> @@ -34,7 +35,6 @@ #include <unistd.h> #endif -#include "mongo/platform/cstdint.h" #include "mongo/platform/hash_namespace.h" namespace mongo { diff --git a/src/mongo/platform/random.h b/src/mongo/platform/random.h index ea63a66852a..29fe7e1c32c 100644 --- a/src/mongo/platform/random.h +++ b/src/mongo/platform/random.h @@ -29,7 +29,7 @@ #pragma once -#include "mongo/platform/cstdint.h" +#include <cstdint> namespace mongo { diff --git a/src/mongo/rpc/command_reply_test.cpp b/src/mongo/rpc/command_reply_test.cpp index e00b8df5ec5..4ace31f46d5 100644 --- a/src/mongo/rpc/command_reply_test.cpp +++ b/src/mongo/rpc/command_reply_test.cpp @@ -28,6 +28,7 @@ #include "mongo/platform/basic.h" +#include <cstdint> #include <iterator> #include <string> #include <vector> @@ -35,7 +36,6 @@ #include "mongo/base/data_type_endian.h" #include "mongo/base/data_view.h" #include "mongo/db/jsobj.h" -#include "mongo/platform/cstdint.h" #include "mongo/rpc/command_reply.h" #include "mongo/stdx/memory.h" #include "mongo/unittest/unittest.h" diff --git a/src/mongo/rpc/protocol.h b/src/mongo/rpc/protocol.h index 8999f0b40d2..82c349ccc9e 100644 --- a/src/mongo/rpc/protocol.h +++ b/src/mongo/rpc/protocol.h @@ -28,11 +28,11 @@ #pragma once +#include <cstdint> #include <string> #include <type_traits> #include "mongo/base/status_with.h" -#include "mongo/platform/cstdint.h" namespace mongo { class BSONObj; diff --git a/src/mongo/s/client/shard_connection_test.cpp b/src/mongo/s/client/shard_connection_test.cpp index 5f14a3872f7..da426a60a30 100644 --- a/src/mongo/s/client/shard_connection_test.cpp +++ b/src/mongo/s/client/shard_connection_test.cpp @@ -25,6 +25,7 @@ * then also delete it in the license file. */ +#include <cstdint> #include <vector> #include "mongo/base/init.h" @@ -37,7 +38,6 @@ #include "mongo/db/service_context_noop.h" #include "mongo/dbtests/mock/mock_conn_registry.h" #include "mongo/dbtests/mock/mock_dbclient_connection.h" -#include "mongo/platform/cstdint.h" #include "mongo/s/client/shard_connection.h" #include "mongo/stdx/memory.h" #include "mongo/stdx/thread.h" diff --git a/src/mongo/s/write_ops/batched_command_response_test.cpp b/src/mongo/s/write_ops/batched_command_response_test.cpp index ba53f201128..8587fc92eb6 100644 --- a/src/mongo/s/write_ops/batched_command_response_test.cpp +++ b/src/mongo/s/write_ops/batched_command_response_test.cpp @@ -28,11 +28,11 @@ #include "mongo/s/write_ops/batched_command_response.h" +#include <cstdint> #include <string> #include "mongo/db/jsobj.h" #include "mongo/s/write_ops/write_error_detail.h" -#include "mongo/platform/cstdint.h" #include "mongo/unittest/unittest.h" namespace { diff --git a/src/mongo/scripting/v8-3.25_utils.cpp b/src/mongo/scripting/v8-3.25_utils.cpp index c25396ba0bf..a2f745b0d1a 100644 --- a/src/mongo/scripting/v8-3.25_utils.cpp +++ b/src/mongo/scripting/v8-3.25_utils.cpp @@ -31,12 +31,12 @@ #include "mongo/scripting/v8-3.25_utils.h" +#include <cstdint> #include <iostream> #include <map> #include <sstream> #include <vector> -#include "mongo/platform/cstdint.h" #include "mongo/scripting/engine_v8-3.25.h" #include "mongo/scripting/v8-3.25_db.h" #include "mongo/stdx/condition_variable.h" diff --git a/src/mongo/scripting/v8_deadline_monitor.h b/src/mongo/scripting/v8_deadline_monitor.h index 11d2851162c..89f7e9d1b84 100644 --- a/src/mongo/scripting/v8_deadline_monitor.h +++ b/src/mongo/scripting/v8_deadline_monitor.h @@ -27,8 +27,9 @@ */ #pragma once +#include <cstdint> + #include "mongo/base/disallow_copying.h" -#include "mongo/platform/cstdint.h" #include "mongo/platform/unordered_map.h" #include "mongo/stdx/condition_variable.h" #include "mongo/stdx/thread.h" diff --git a/src/mongo/scripting/v8_utils.cpp b/src/mongo/scripting/v8_utils.cpp index e37b1fc1e1c..c7610fb0c20 100644 --- a/src/mongo/scripting/v8_utils.cpp +++ b/src/mongo/scripting/v8_utils.cpp @@ -31,12 +31,12 @@ #include "mongo/scripting/v8_utils.h" +#include <cstdint> #include <iostream> #include <map> #include <sstream> #include <vector> -#include "mongo/platform/cstdint.h" #include "mongo/scripting/engine_v8.h" #include "mongo/scripting/v8_db.h" #include "mongo/stdx/condition_variable.h" diff --git a/src/mongo/util/decoration_container.h b/src/mongo/util/decoration_container.h index b0318f7df37..2fc71c73b17 100644 --- a/src/mongo/util/decoration_container.h +++ b/src/mongo/util/decoration_container.h @@ -28,10 +28,10 @@ #pragma once +#include <cstdint> #include <memory> #include "mongo/base/disallow_copying.h" -#include "mongo/platform/cstdint.h" namespace mongo { diff --git a/src/mongo/util/elapsed_tracker.h b/src/mongo/util/elapsed_tracker.h index 8633f6296a4..2b14d0abf83 100644 --- a/src/mongo/util/elapsed_tracker.h +++ b/src/mongo/util/elapsed_tracker.h @@ -30,7 +30,7 @@ #pragma once -#include "mongo/platform/cstdint.h" +#include <cstdint> namespace mongo { diff --git a/src/mongo/util/file.cpp b/src/mongo/util/file.cpp index 61196f39558..6e64dba7e08 100644 --- a/src/mongo/util/file.cpp +++ b/src/mongo/util/file.cpp @@ -31,6 +31,7 @@ #include <boost/cstdint.hpp> #include <boost/filesystem/operations.hpp> +#include <cstdint> #include <iostream> #include <string> @@ -42,7 +43,6 @@ #endif #include "mongo/platform/basic.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/allocator.h" #include "mongo/util/assert_util.h" #include "mongo/util/log.h" diff --git a/src/mongo/util/file.h b/src/mongo/util/file.h index 75ce1898b55..ac8b0e019f5 100644 --- a/src/mongo/util/file.h +++ b/src/mongo/util/file.h @@ -29,10 +29,10 @@ #pragma once +#include <cstdint> #include <string> #include "mongo/platform/basic.h" -#include "mongo/platform/cstdint.h" namespace mongo { diff --git a/src/mongo/util/net/message.h b/src/mongo/util/net/message.h index fb0be29042e..a0a248f9b14 100644 --- a/src/mongo/util/net/message.h +++ b/src/mongo/util/net/message.h @@ -29,10 +29,10 @@ #pragma once +#include <cstdint> #include <vector> #include "mongo/platform/atomic_word.h" -#include "mongo/platform/cstdint.h" #include "mongo/base/data_type_endian.h" #include "mongo/base/data_view.h" #include "mongo/base/encoded_value_storage.h" diff --git a/src/mongo/util/net/sock.h b/src/mongo/util/net/sock.h index 03d751c70fb..5393b6cca72 100644 --- a/src/mongo/util/net/sock.h +++ b/src/mongo/util/net/sock.h @@ -44,6 +44,7 @@ #endif // not _WIN32 +#include <cstdint> #include <string> #include <utility> #include <vector> @@ -52,7 +53,6 @@ #include "mongo/config.h" #include "mongo/logger/log_severity.h" #include "mongo/platform/compiler.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/assert_util.h" namespace mongo { diff --git a/src/mongo/util/processinfo.h b/src/mongo/util/processinfo.h index 551ed8c6629..86305a9babe 100644 --- a/src/mongo/util/processinfo.h +++ b/src/mongo/util/processinfo.h @@ -29,10 +29,10 @@ #pragma once +#include <cstdint> #include <string> #include "mongo/db/jsobj.h" -#include "mongo/platform/cstdint.h" #include "mongo/platform/process_id.h" #include "mongo/util/concurrency/mutex.h" diff --git a/src/mongo/util/time_support.cpp b/src/mongo/util/time_support.cpp index 30639380555..62714fd3e51 100644 --- a/src/mongo/util/time_support.cpp +++ b/src/mongo/util/time_support.cpp @@ -29,15 +29,15 @@ #include "mongo/util/time_support.h" +#include <boost/thread/tss.hpp> +#include <cstdint> #include <cstdio> #include <string> #include <iostream> -#include <boost/thread/tss.hpp> #include "mongo/base/init.h" #include "mongo/base/parse_number.h" #include "mongo/bson/util/builder.h" -#include "mongo/platform/cstdint.h" #include "mongo/stdx/thread.h" #include "mongo/util/assert_util.h" #include "mongo/util/mongoutils/str.h" |