summaryrefslogtreecommitdiff
path: root/src/mongo/util
diff options
context:
space:
mode:
authorMark Benvenuto <mark.benvenuto@mongodb.com>2016-05-28 17:55:10 -0400
committerMark Benvenuto <mark.benvenuto@mongodb.com>2016-05-28 17:55:10 -0400
commit8ff8b380201ff2866e81f74cf914227a9bd272fa (patch)
treeaabe9ec55e5b769e66fe215d59357ddb2721e6ef /src/mongo/util
parent8d94f1c084b85c34b0c3c10cb8367491681b4a0e (diff)
downloadmongo-8ff8b380201ff2866e81f74cf914227a9bd272fa.tar.gz
SERVER-23971 Fixup headers to workaround clang-format 3.8 include sorting bug
Diffstat (limited to 'src/mongo/util')
-rw-r--r--src/mongo/util/concurrency/spin_lock_test.cpp2
-rw-r--r--src/mongo/util/duration_test.cpp2
-rw-r--r--src/mongo/util/net/hostandport_test.cpp2
-rw-r--r--src/mongo/util/processinfo_osx.cpp7
-rw-r--r--src/mongo/util/secure_zero_memory_test.cpp2
5 files changed, 12 insertions, 3 deletions
diff --git a/src/mongo/util/concurrency/spin_lock_test.cpp b/src/mongo/util/concurrency/spin_lock_test.cpp
index 27bd9e83681..a830ba07db6 100644
--- a/src/mongo/util/concurrency/spin_lock_test.cpp
+++ b/src/mongo/util/concurrency/spin_lock_test.cpp
@@ -26,6 +26,8 @@
* then also delete it in the license file.
*/
+#include "mongo/platform/basic.h"
+
#include "mongo/stdx/functional.h"
#include "mongo/stdx/thread.h"
#include "mongo/unittest/unittest.h"
diff --git a/src/mongo/util/duration_test.cpp b/src/mongo/util/duration_test.cpp
index 0a5f8c95c2a..95501cc5d95 100644
--- a/src/mongo/util/duration_test.cpp
+++ b/src/mongo/util/duration_test.cpp
@@ -25,6 +25,8 @@
* then also delete it in the license file.
*/
+#include "mongo/platform/basic.h"
+
#include "mongo/stdx/chrono.h"
#include "mongo/util/duration.h"
#include "mongo/unittest/unittest.h"
diff --git a/src/mongo/util/net/hostandport_test.cpp b/src/mongo/util/net/hostandport_test.cpp
index c325a7d111a..932c0d159bf 100644
--- a/src/mongo/util/net/hostandport_test.cpp
+++ b/src/mongo/util/net/hostandport_test.cpp
@@ -25,6 +25,8 @@
* then also delete it in the license file.
*/
+#include "mongo/platform/basic.h"
+
#include "mongo/db/server_options.h"
#include "mongo/unittest/unittest.h"
#include "mongo/util/assert_util.h"
diff --git a/src/mongo/util/processinfo_osx.cpp b/src/mongo/util/processinfo_osx.cpp
index c8e786bfac2..f15601c5390 100644
--- a/src/mongo/util/processinfo_osx.cpp
+++ b/src/mongo/util/processinfo_osx.cpp
@@ -30,9 +30,6 @@
#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kControl
#include "mongo/platform/basic.h"
-#include "mongo/util/processinfo.h"
-#include "mongo/util/log.h"
-#include "mongo/db/jsobj.h"
#include <boost/none.hpp>
#include <boost/optional.hpp>
@@ -51,6 +48,10 @@
#include <sys/mman.h>
#include <sys/sysctl.h>
+#include "mongo/db/jsobj.h"
+#include "mongo/util/log.h"
+#include "mongo/util/processinfo.h"
+
using namespace std;
namespace mongo {
diff --git a/src/mongo/util/secure_zero_memory_test.cpp b/src/mongo/util/secure_zero_memory_test.cpp
index fbdc81590a3..e50b9d7ed9f 100644
--- a/src/mongo/util/secure_zero_memory_test.cpp
+++ b/src/mongo/util/secure_zero_memory_test.cpp
@@ -25,6 +25,8 @@
* then also delete it in the license file.
*/
+#include "mongo/platform/basic.h"
+
#include "mongo/unittest/death_test.h"
#include "mongo/unittest/unittest.h"
#include "mongo/util/assert_util.h"