summaryrefslogtreecommitdiff
path: root/src/mongo/client
diff options
context:
space:
mode:
Diffstat (limited to 'src/mongo/client')
-rw-r--r--src/mongo/client/clientAndShell.cpp13
-rw-r--r--src/mongo/client/connpool.cpp9
-rw-r--r--src/mongo/client/dbclient.cpp2
-rw-r--r--src/mongo/client/dbclient_rs.cpp2
-rw-r--r--src/mongo/client/dbclientcursor.cpp2
-rw-r--r--src/mongo/client/dbclientmockcursor.h2
-rw-r--r--src/mongo/client/distlock.cpp2
-rw-r--r--src/mongo/client/distlock.h4
-rw-r--r--src/mongo/client/distlock_test.cpp8
-rw-r--r--src/mongo/client/examples/httpClientTest.cpp2
-rw-r--r--src/mongo/client/examples/mongoperf.cpp2
-rw-r--r--src/mongo/client/examples/tail.cpp4
-rw-r--r--src/mongo/client/gridfs.cpp11
-rw-r--r--src/mongo/client/model.cpp8
-rw-r--r--src/mongo/client/parallel.cpp5
-rw-r--r--src/mongo/client/syncclusterconnection.cpp2
16 files changed, 42 insertions, 36 deletions
diff --git a/src/mongo/client/clientAndShell.cpp b/src/mongo/client/clientAndShell.cpp
index 92f12e40055..a7dd940aa8e 100644
--- a/src/mongo/client/clientAndShell.cpp
+++ b/src/mongo/client/clientAndShell.cpp
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-#include "pch.h"
+#include "mongo/pch.h"
+
+#include "mongo/client/clientOnly-private.h"
+#include "mongo/db/client_basic.h"
+#include "mongo/db/cmdline.h"
+#include "mongo/s/shard.h"
#include "mongo/util/assert_util.h"
-#include "../db/cmdline.h"
-#include "../db/client_basic.h"
-#include "../s/shard.h"
-#include "../util/timer.h"
-#include "clientOnly-private.h"
+#include "mongo/util/timer.h"
namespace mongo {
diff --git a/src/mongo/client/connpool.cpp b/src/mongo/client/connpool.cpp
index 36cd5919e85..d868b4cc6c9 100644
--- a/src/mongo/client/connpool.cpp
+++ b/src/mongo/client/connpool.cpp
@@ -18,11 +18,12 @@
// _ todo: reconnect?
-#include "pch.h"
-#include "connpool.h"
-#include "syncclusterconnection.h"
-#include "../s/shard.h"
+#include "mongo/pch.h"
+
+#include "mongo/client/connpool.h"
#include "mongo/client/dbclient_rs.h"
+#include "mongo/client/syncclusterconnection.h"
+#include "mongo/s/shard.h"
namespace mongo {
diff --git a/src/mongo/client/dbclient.cpp b/src/mongo/client/dbclient.cpp
index ff42ea2c180..5e9d508e75b 100644
--- a/src/mongo/client/dbclient.cpp
+++ b/src/mongo/client/dbclient.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "pch.h"
+#include "mongo/pch.h"
#include "mongo/bson/util/bson_extract.h"
#include "mongo/bson/util/builder.h"
diff --git a/src/mongo/client/dbclient_rs.cpp b/src/mongo/client/dbclient_rs.cpp
index 89c52270d5b..94e42160e7e 100644
--- a/src/mongo/client/dbclient_rs.cpp
+++ b/src/mongo/client/dbclient_rs.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "pch.h"
+#include "mongo/pch.h"
#include "mongo/client/dbclient_rs.h"
diff --git a/src/mongo/client/dbclientcursor.cpp b/src/mongo/client/dbclientcursor.cpp
index 53f22425fec..1c9ba855ff1 100644
--- a/src/mongo/client/dbclientcursor.cpp
+++ b/src/mongo/client/dbclientcursor.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "pch.h"
+#include "mongo/pch.h"
#include "mongo/client/dbclientcursor.h"
diff --git a/src/mongo/client/dbclientmockcursor.h b/src/mongo/client/dbclientmockcursor.h
index 8d85ff5ad2e..41e0475a72e 100644
--- a/src/mongo/client/dbclientmockcursor.h
+++ b/src/mongo/client/dbclientmockcursor.h
@@ -17,7 +17,7 @@
#pragma once
-#include "dbclientcursor.h"
+#include "mongo/client/dbclientcursor.h"
namespace mongo {
diff --git a/src/mongo/client/distlock.cpp b/src/mongo/client/distlock.cpp
index 9a4d39f9770..f4efa174bbb 100644
--- a/src/mongo/client/distlock.cpp
+++ b/src/mongo/client/distlock.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include "pch.h"
+#include "mongo/pch.h"
#include "mongo/client/distlock.h"
diff --git a/src/mongo/client/distlock.h b/src/mongo/client/distlock.h
index 183826afcce..798ffbda44c 100644
--- a/src/mongo/client/distlock.h
+++ b/src/mongo/client/distlock.h
@@ -18,8 +18,8 @@
#pragma once
#include "mongo/pch.h"
-#include "connpool.h"
-#include "syncclusterconnection.h"
+#include "mongo/client/connpool.h"
+#include "mongo/client/syncclusterconnection.h"
#define LOCK_TIMEOUT (15 * 60 * 1000)
#define LOCK_SKEW_FACTOR (30)
diff --git a/src/mongo/client/distlock_test.cpp b/src/mongo/client/distlock_test.cpp
index aa5ba21069a..f579f603c34 100644
--- a/src/mongo/client/distlock_test.cpp
+++ b/src/mongo/client/distlock_test.cpp
@@ -15,13 +15,13 @@
* limitations under the License.
*/
-#include "pch.h"
+#include "mongo/pch.h"
-#include "distlock.h"
+#include "mongo/client/distlock.h"
-#include <vector>
-#include <iostream>
#include <boost/thread/thread.hpp>
+#include <iostream>
+#include <vector>
#include "mongo/base/init.h"
#include "mongo/db/auth/action_set.h"
diff --git a/src/mongo/client/examples/httpClientTest.cpp b/src/mongo/client/examples/httpClientTest.cpp
index c36d8b4752c..4d1774a1c36 100644
--- a/src/mongo/client/examples/httpClientTest.cpp
+++ b/src/mongo/client/examples/httpClientTest.cpp
@@ -19,7 +19,7 @@
#include "mongo/base/init.h"
#include "mongo/client/dbclient.h"
-#include "util/net/httpclient.h"
+#include "mongo/util/net/httpclient.h"
#ifndef verify
# define verify(x) MONGO_verify(x)
diff --git a/src/mongo/client/examples/mongoperf.cpp b/src/mongo/client/examples/mongoperf.cpp
index 4ea9eb74684..e535f187d59 100644
--- a/src/mongo/client/examples/mongoperf.cpp
+++ b/src/mongo/client/examples/mongoperf.cpp
@@ -25,7 +25,7 @@
// so we define the following macro
#define MONGO_EXPOSE_MACROS 1
-#include "pch.h"
+#include "mongo/pch.h"
#include <iostream>
diff --git a/src/mongo/client/examples/tail.cpp b/src/mongo/client/examples/tail.cpp
index 90e62d279c1..d6d7a4f40ce 100644
--- a/src/mongo/client/examples/tail.cpp
+++ b/src/mongo/client/examples/tail.cpp
@@ -17,8 +17,8 @@
/* example of using a tailable cursor */
-#include "../../client/dbclient.h"
-#include "../../util/goodies.h"
+#include "mongo/client/dbclient.h"
+#include "mongo/util/goodies.h"
using namespace mongo;
diff --git a/src/mongo/client/gridfs.cpp b/src/mongo/client/gridfs.cpp
index e2d1038d6ee..1c3d0dd3142 100644
--- a/src/mongo/client/gridfs.cpp
+++ b/src/mongo/client/gridfs.cpp
@@ -15,25 +15,26 @@
* limitations under the License.
*/
-#include "pch.h"
+#include "mongo/pch.h"
+#include "mongo/client/gridfs.h"
+
+#include <boost/filesystem/operations.hpp>
#include <boost/smart_ptr.hpp>
#include <fcntl.h>
#include <fstream>
#include <utility>
-#include "mongo/client/gridfs.h"
-#include "mongo/client/dbclientcursor.h"
-
#if defined(_WIN32)
#include <io.h>
#endif
+#include "mongo/client/dbclientcursor.h"
+
#ifndef MIN
#define MIN(a,b) ( (a) < (b) ? (a) : (b) )
#endif
-#include <boost/filesystem/operations.hpp>
namespace mongo {
diff --git a/src/mongo/client/model.cpp b/src/mongo/client/model.cpp
index ac9bd119e76..deb3243b4dd 100644
--- a/src/mongo/client/model.cpp
+++ b/src/mongo/client/model.cpp
@@ -15,9 +15,11 @@
* limitations under the License.
*/
-#include "pch.h"
-#include "model.h"
-#include "connpool.h"
+#include "mongo/pch.h"
+
+#include "mongo/client/model.h"
+
+#include "mongo/client/connpool.h"
namespace mongo {
diff --git a/src/mongo/client/parallel.cpp b/src/mongo/client/parallel.cpp
index a55eb9785a2..65ba208119d 100644
--- a/src/mongo/client/parallel.cpp
+++ b/src/mongo/client/parallel.cpp
@@ -16,11 +16,12 @@
*/
-#include "pch.h"
+#include "mongo/pch.h"
+
+#include "mongo/client/parallel.h"
#include "mongo/client/connpool.h"
#include "mongo/client/dbclientcursor.h"
-#include "mongo/client/parallel.h"
#include "mongo/db/dbmessage.h"
#include "mongo/s/chunk.h"
#include "mongo/s/chunk_version.h"
diff --git a/src/mongo/client/syncclusterconnection.cpp b/src/mongo/client/syncclusterconnection.cpp
index 28977d673d0..2da9db0d28e 100644
--- a/src/mongo/client/syncclusterconnection.cpp
+++ b/src/mongo/client/syncclusterconnection.cpp
@@ -16,7 +16,7 @@
*/
-#include "pch.h"
+#include "mongo/pch.h"
#include "mongo/client/syncclusterconnection.h"