summaryrefslogtreecommitdiff
path: root/src/mongo/s/shardkey.cpp
diff options
context:
space:
mode:
authorEric Milkie <milkie@10gen.com>2012-04-02 14:55:19 -0400
committerEric Milkie <milkie@10gen.com>2012-04-02 14:59:48 -0400
commit45f30389a9128fe2216371cabbe8426b634d68e9 (patch)
treea3f0fc2b758e58c0ec61a27110f1e7b26f034f76 /src/mongo/s/shardkey.cpp
parent8b1c9bd361bd002980266c5269e5eab4ba62a7f5 (diff)
downloadmongo-45f30389a9128fe2216371cabbe8426b634d68e9.tar.gz
SERVER-5348 make dbclient.h the main C++ driver include file
This change fixes some #defines of common C functions so that their definitions do not leak into consumer code. I also had to change Labeler SIZE because it conflicts with Windows SIZE. pch.h is on its way out, but for now it's hanging around.
Diffstat (limited to 'src/mongo/s/shardkey.cpp')
-rw-r--r--src/mongo/s/shardkey.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mongo/s/shardkey.cpp b/src/mongo/s/shardkey.cpp
index f926bba314b..ff6bafa0cad 100644
--- a/src/mongo/s/shardkey.cpp
+++ b/src/mongo/s/shardkey.cpp
@@ -19,6 +19,7 @@
#include "pch.h"
#include "chunk.h"
#include "../db/jsobj.h"
+#include "mongo/db/json.h"
#include "../util/unittest.h"
#include "../util/timer.h"