mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 17:10:48 +01:00
Code Issues Releases Activity

merge

Browse Source
This commit is contained in:
Aaron 2010-05-13 10:55:14 -07:00
parent 052f894fd1
commit 12f2748b51
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/queryutil.cpp
View File

@ -574,7 +574,7 @@ namespace mongo {
BSONObjIterator j( e.embeddedObject() );
if ( j.more() ) { // could be assert instead
BSONElement f = j.next();
massert( 13259, "$or array must contain objects", f.type() == Object );
massert( 13275, "$or array must contain objects", f.type() == Object );
if ( !j.more() ) { // if only one $or field, subfields are all required
BSONObjIterator k( f.embeddedObject() );
while( k.more() ) {

2
db/queryutil.h
View File

@ -223,7 +223,7 @@ namespace mongo {
// bool orFinished() const { return _orFound && _orSets.empty(); }
// // removes first or clause, and removes the field ranges it covers from all subsequent or clauses
// void popOrClause() {
// massert( 13260, "no or clause to pop", !orFinished() );
// massert( 13274, "no or clause to pop", !orFinished() );
// const FieldRangeSet &toPop = _orSets.front();
// list< FieldRangeSet >::iterator i = _orSets.begin();
// ++i;