summaryrefslogtreecommitdiff
path: root/src/mongo/bson
diff options
context:
space:
mode:
authorTyler Brock <tyler.brock@gmail.com>2014-07-14 16:22:10 -0400
committerTyler Brock <tyler.brock@gmail.com>2014-07-14 18:43:24 -0400
commit6d1570d1001a57fcac0f6412c8f22059609029c4 (patch)
treeb058b00689895ba6740dc1aefc8a4ef66955f46c /src/mongo/bson
parentba71ad619c49f84ee8179227d16ecc79a65ab535 (diff)
downloadmongo-6d1570d1001a57fcac0f6412c8f22059609029c4.tar.gz
SERVER-12751 remove BSONBuilderBase
Diffstat (limited to 'src/mongo/bson')
-rw-r--r--src/mongo/bson/bson_builder_base.h70
-rw-r--r--src/mongo/bson/bsonobjbuilder.h5
2 files changed, 2 insertions, 73 deletions
diff --git a/src/mongo/bson/bson_builder_base.h b/src/mongo/bson/bson_builder_base.h
deleted file mode 100644
index 578700ea590..00000000000
--- a/src/mongo/bson/bson_builder_base.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Copyright 2012 10gen Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * As a special exception, the copyright holders give permission to link the
- * code of portions of this program with the OpenSSL library under certain
- * conditions as described in each individual source file and distribute
- * linked combinations including the program with the OpenSSL library. You
- * must comply with the GNU Affero General Public License in all respects
- * for all of the code used other than as permitted herein. If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so. If you do not
- * wish to do so, delete this exception statement from your version. If you
- * delete this exception statement from all source files in the program,
- * then also delete it in the license file.
- */
-
-#pragma once
-
-#include "mongo/base/string_data.h"
-#include "mongo/bson/util/builder.h"
-
-namespace mongo {
-
- /*
- * BSONBuilderBase contains the common interface between different types of BSON builders.
- *
- * Currently, this interface is not comprehensive. But we should work toward that goal. If
- * you are maintaining the class, please make sure that all Builders behave coherently.
- */
- class BSONBuilderBase {
- public:
- virtual ~BSONBuilderBase() {}
-
- virtual BSONObj obj() = 0;
-
- virtual BufBuilder& subobjStart( const StringData& fieldName ) = 0;
-
- virtual BufBuilder& subarrayStart( const StringData& fieldName ) = 0;
-
- virtual BSONBuilderBase& append( const BSONElement& e) = 0;
-
- virtual BSONBuilderBase& append( const StringData& fieldName , int n ) = 0;
-
- virtual BSONBuilderBase& append( const StringData& fieldName , long long n ) = 0;
-
- virtual BSONBuilderBase& append( const StringData& fieldName , double n ) = 0;
-
- virtual BSONBuilderBase& appendArray( const StringData& fieldName , const BSONObj& subObj ) = 0;
-
- virtual BSONBuilderBase& appendAs( const BSONElement& e , const StringData& filedName ) = 0;
-
- virtual void appendNull( ) = 0;
-
- virtual BSONBuilderBase& operator<<( const BSONElement& e ) = 0;
-
- virtual bool isArray() const = 0;
- };
-
-} // namespace mongo
diff --git a/src/mongo/bson/bsonobjbuilder.h b/src/mongo/bson/bsonobjbuilder.h
index f1e91313303..61e1cbd85b9 100644
--- a/src/mongo/bson/bsonobjbuilder.h
+++ b/src/mongo/bson/bsonobjbuilder.h
@@ -43,7 +43,6 @@
#include "mongo/bson/bsonelement.h"
#include "mongo/bson/bsonobj.h"
#include "mongo/bson/bsonmisc.h"
-#include "mongo/bson/bson_builder_base.h"
#include "mongo/bson/bson_field.h"
#include "mongo/client/export_macros.h"
@@ -61,7 +60,7 @@ namespace mongo {
/** Utility for creating a BSONObj.
See also the BSON() and BSON_ARRAY() macros.
*/
- class MONGO_CLIENT_API BSONObjBuilder : public BSONBuilderBase, private boost::noncopyable {
+ class MONGO_CLIENT_API BSONObjBuilder : boost::noncopyable {
public:
/** @param initsize this is just a hint as to the final size of the object */
BSONObjBuilder(int initsize=512) : _b(_buf), _buf(initsize + sizeof(unsigned)), _offset( sizeof(unsigned) ), _s( this ) , _tracker(0) , _doneCalled(false) {
@@ -714,7 +713,7 @@ namespace mongo {
static bool numStrsReady; // for static init safety
};
- class BSONArrayBuilder : public BSONBuilderBase, private boost::noncopyable {
+ class BSONArrayBuilder : boost::noncopyable {
public:
BSONArrayBuilder() : _i(0), _b() {}
BSONArrayBuilder( BufBuilder &_b ) : _i(0), _b(_b) {}