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/client/gridfs.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/client/gridfs.h')
| -rw-r--r-- | src/mongo/client/gridfs.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/client/gridfs.h b/src/mongo/client/gridfs.h index 5a19aa142ca..49a76a5e55f 100644 --- a/src/mongo/client/gridfs.h +++ b/src/mongo/client/gridfs.h @@ -17,8 +17,9 @@ #pragma once -#include "dbclient.h" -#include "redef_macros.h" +#include "mongo/bson/bsonelement.h" +#include "mongo/bson/bsonobj.h" +#include "mongo/client/dbclientinterface.h" namespace mongo { @@ -201,5 +202,3 @@ namespace mongo { friend class GridFS; }; } - -#include "undef_macros.h" |