diff options
| author | Eric Milkie <milkie@10gen.com> | 2012-04-02 14:55:19 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2012-04-02 14:59:48 -0400 |
| commit | 45f30389a9128fe2216371cabbe8426b634d68e9 (patch) | |
| tree | a3f0fc2b758e58c0ec61a27110f1e7b26f034f76 /src/mongo/bson/bsonmisc.h | |
| parent | 8b1c9bd361bd002980266c5269e5eab4ba62a7f5 (diff) | |
| download | mongo-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/bson/bsonmisc.h')
| -rw-r--r-- | src/mongo/bson/bsonmisc.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mongo/bson/bsonmisc.h b/src/mongo/bson/bsonmisc.h index 29a32d53bde..5f6b725251c 100644 --- a/src/mongo/bson/bsonmisc.h +++ b/src/mongo/bson/bsonmisc.h @@ -127,7 +127,7 @@ namespace mongo { extern Labeler::Label LTE; extern Labeler::Label NE; extern Labeler::Label NIN; - extern Labeler::Label SIZE; + extern Labeler::Label BSIZE; // $or helper: OR(BSON("x" << GT << 7), BSON("y" << LT << 6)); |