diff options
author | Andrew Morrow <acm@mongodb.com> | 2015-06-30 19:33:22 -0400 |
---|---|---|
committer | Andrew Morrow <acm@mongodb.com> | 2015-07-06 16:41:08 -0400 |
commit | 8567716e593426868f161a7e5e822486ca93336c (patch) | |
tree | 5a4c44abb140516809dda5089c4fc4a39f63bd36 /src/mongo | |
parent | 57d9fb54686971d60d0ec8d01afa944dd6ca3730 (diff) | |
download | mongo-8567716e593426868f161a7e5e822486ca93336c.tar.gz |
SERVER-18928 Remove remaining uses of platform/cstdint
Diffstat (limited to 'src/mongo')
-rwxr-xr-x | src/mongo/db/auth/generate_action_types.py | 4 | ||||
-rw-r--r-- | src/mongo/db/storage/record_store_test_harness.h | 3 | ||||
-rw-r--r-- | src/mongo/platform/cstdint.h | 39 | ||||
-rw-r--r-- | src/mongo/util/file.cpp | 1 |
4 files changed, 4 insertions, 43 deletions
diff --git a/src/mongo/db/auth/generate_action_types.py b/src/mongo/db/auth/generate_action_types.py index ee87fcb5204..5de15276a27 100755 --- a/src/mongo/db/auth/generate_action_types.py +++ b/src/mongo/db/auth/generate_action_types.py @@ -66,12 +66,12 @@ headerFileTemplate = """// AUTO-GENERATED FILE DO NOT EDIT #pragma once +#include <cstdint> #include <iosfwd> #include <map> #include <string> #include "mongo/base/status.h" -#include "mongo/platform/cstdint.h" namespace mongo { @@ -148,11 +148,11 @@ sourceFileTemplate = """// AUTO-GENERATED FILE DO NOT EDIT #include "mongo/db/auth/action_type.h" +#include <cstdint> #include <iostream> #include <string> #include "mongo/base/status.h" -#include "mongo/platform/cstdint.h" #include "mongo/util/mongoutils/str.h" namespace mongo { diff --git a/src/mongo/db/storage/record_store_test_harness.h b/src/mongo/db/storage/record_store_test_harness.h index 818f29aec2c..69d7640047f 100644 --- a/src/mongo/db/storage/record_store_test_harness.h +++ b/src/mongo/db/storage/record_store_test_harness.h @@ -30,9 +30,10 @@ #pragma once +#include <cstdint> + #include "mongo/db/operation_context_noop.h" #include "mongo/db/service_context_noop.h" -#include "mongo/platform/cstdint.h" #include "mongo/stdx/memory.h" namespace mongo { diff --git a/src/mongo/platform/cstdint.h b/src/mongo/platform/cstdint.h deleted file mode 100644 index c6f39ac3ff6..00000000000 --- a/src/mongo/platform/cstdint.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - * Copyright 2012 10gen Inc. - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License, version 3, - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - * As a special exception, the copyright holders give permission to link the - * code of portions of this program with the OpenSSL library under certain - * conditions as described in each individual source file and distribute - * linked combinations including the program with the OpenSSL library. You - * must comply with the GNU Affero General Public License in all respects - * for all of the code used other than as permitted herein. If you modify - * file(s) with this exception, you may extend this exception to your - * version of the file(s), but you are not obligated to do so. If you do not - * wish to do so, delete this exception statement from your version. If you - * delete this exception statement from all source files in the program, - * then also delete it in the license file. - */ - -#pragma once - -/** - * This file is a deprecated synonym for #include <cstdint> that predates the availability - * of <cstdint> on all supported platforms and compilers. - * - * Per SERVER-18928, please refrain from including this file in new code, and remove references to - * it in favor of <cstdint> when updating includes. - */ - -#include <cstdint> diff --git a/src/mongo/util/file.cpp b/src/mongo/util/file.cpp index 6e64dba7e08..bcb4b74e989 100644 --- a/src/mongo/util/file.cpp +++ b/src/mongo/util/file.cpp @@ -29,7 +29,6 @@ #include "mongo/util/file.h" -#include <boost/cstdint.hpp> #include <boost/filesystem/operations.hpp> #include <cstdint> #include <iostream> |