Imported Upstream version 2.0.0

1 files changed, 7 insertions, 9 deletions

diff --git a/bson/bsonmisc.h b/bson/bsonmisc.h
index 96be12a..8abb487 100644
--- a/bson/bsonmisc.h
+++ b/bson/bsonmisc.h
@@ -29,20 +29,16 @@ namespace mongo {
 
     class BSONObjCmp {
     public:
-        BSONObjCmp( const BSONObj &_order = BSONObj() ) : order( _order ) {}
+        BSONObjCmp( const BSONObj &order = BSONObj() ) : _order( order ) {}
         bool operator()( const BSONObj &l, const BSONObj &r ) const {
-            return l.woCompare( r, order ) < 0;
+            return l.woCompare( r, _order ) < 0;
         }
+        BSONObj order() const { return _order; }
     private:
-        BSONObj order;
+        BSONObj _order;
     };
 
-    class BSONObjCmpDefaultOrder : public BSONObjCmp {
-    public:
-        BSONObjCmpDefaultOrder() : BSONObjCmp( BSONObj() ) {}
-    };
-
-    typedef set< BSONObj, BSONObjCmpDefaultOrder > BSONObjSetDefaultOrder;
+    typedef set<BSONObj,BSONObjCmp> BSONObjSet;
 
     enum FieldCompareResult {
         LEFT_SUBFIELD = -2,
@@ -202,4 +198,6 @@ namespace mongo {
         int _sizes[SIZE];
     };
 
+    // considers order
+    bool fieldsMatch(const BSONObj& lhs, const BSONObj& rhs);
 }