diff options
| author | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2017-03-01 14:15:00 -0500 |
|---|---|---|
| committer | Kaloian Manassiev <kaloian.manassiev@mongodb.com> | 2017-03-02 18:53:24 -0500 |
| commit | 2c90ba1e6bbcb096f0d61e706b57b31a3d83d1f1 (patch) | |
| tree | b2392631df01f51ac8c9e45fc204bce8d28e32b3 | |
| parent | 0566ddd5e3979defb7ba2b525c7e61eb8e3e1ea7 (diff) | |
| download | mongo-2c90ba1e6bbcb096f0d61e706b57b31a3d83d1f1.tar.gz | |
SERVER-28155 Remove usages of BSONSerializable outside of sharding
(cherry picked from commit a61cbeacfd3e5132ef5cb6774978f861033880bc)
| -rw-r--r-- | src/mongo/db/auth/privilege_parser.h | 7 | ||||
| -rw-r--r-- | src/mongo/db/field_parser.h | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/mongo/db/auth/privilege_parser.h b/src/mongo/db/auth/privilege_parser.h index 6275dcc2a3d..aa78c5c67d7 100644 --- a/src/mongo/db/auth/privilege_parser.h +++ b/src/mongo/db/auth/privilege_parser.h @@ -33,7 +33,6 @@ #include "mongo/base/string_data.h" #include "mongo/db/jsobj.h" -#include "mongo/s/bson_serializable.h" namespace mongo { @@ -43,7 +42,7 @@ class Privilege; * This class is used to parse documents describing resources as they are represented as part * of privileges granted to roles in the role management commands. */ -class ParsedResource : BSONSerializable { +class ParsedResource { MONGO_DISALLOW_COPYING(ParsedResource); public: @@ -74,7 +73,7 @@ public: BSONObj toBSON() const; bool parseBSON(const BSONObj& source, std::string* errMsg); void clear(); - virtual std::string toString() const; + std::string toString() const; // // individual field accessors @@ -123,7 +122,7 @@ private: /** * This class is used to parse documents describing privileges in the role managment commands. */ -class ParsedPrivilege : BSONSerializable { +class ParsedPrivilege { MONGO_DISALLOW_COPYING(ParsedPrivilege); public: diff --git a/src/mongo/db/field_parser.h b/src/mongo/db/field_parser.h index 01487d8c894..376bd66f561 100644 --- a/src/mongo/db/field_parser.h +++ b/src/mongo/db/field_parser.h @@ -31,7 +31,6 @@ #include <string> #include "mongo/db/jsobj.h" -#include "mongo/s/bson_serializable.h" #include "mongo/util/time_support.h" namespace mongo { |