diff options
author | Eliot Horowitz <eliot@10gen.com> | 2013-06-05 11:48:11 -0400 |
---|---|---|
committer | Eliot Horowitz <eliot@10gen.com> | 2013-06-05 11:49:39 -0400 |
commit | e0c8f9047f55ccfc1012c47689871d519f7f6dc0 (patch) | |
tree | 277c58700ab75633f51de4c28e3314b174c9c95d /src/mongo/db/matcher/path.cpp | |
parent | c4378a6f860a68117b2c879944b3fe39ab6b3e75 (diff) | |
download | mongo-e0c8f9047f55ccfc1012c47689871d519f7f6dc0.tar.gz |
SERVER-9820: change ElementIterator::Element to Context
Diffstat (limited to 'src/mongo/db/matcher/path.cpp')
-rw-r--r-- | src/mongo/db/matcher/path.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/mongo/db/matcher/path.cpp b/src/mongo/db/matcher/path.cpp index 320ea31ad79..15573796d1b 100644 --- a/src/mongo/db/matcher/path.cpp +++ b/src/mongo/db/matcher/path.cpp @@ -34,11 +34,11 @@ namespace mongo { ElementIterator::~ElementIterator(){ } - void ElementIterator::Element::reset() { + void ElementIterator::Context::reset() { _element = BSONElement(); } - void ElementIterator::Element::reset( BSONElement element, + void ElementIterator::Context::reset( BSONElement element, BSONElement arrayOffset, bool outerArray ) { _element = element; @@ -58,14 +58,14 @@ namespace mongo { return _iterator.more() || _returnArrayLast; } - ElementIterator::Element SimpleArrayElementIterator::next() { + ElementIterator::Context SimpleArrayElementIterator::next() { if ( _iterator.more() ) { - Element e; + Context e; e.reset( _iterator.next(), BSONElement(), false ); return e; } _returnArrayLast = false; - Element e; + Context e; e.reset( _theArray, BSONElement(), true ); return e; } @@ -230,13 +230,13 @@ namespace mongo { return false; } - ElementIterator::Element BSONElementIterator::next() { + ElementIterator::Context BSONElementIterator::next() { if ( _subCursor ) { - Element e = _subCursor->next(); + Context e = _subCursor->next(); e.setArrayOffset( _arrayIterationState._current ); return e; } - Element x = _next; + Context x = _next; _next.reset(); return x; } |