diff options
| author | Eric Milkie <milkie@10gen.com> | 2012-03-22 21:38:49 -0400 |
|---|---|---|
| committer | Eric Milkie <milkie@10gen.com> | 2012-03-22 21:38:49 -0400 |
| commit | f6f104dac1959e4294e26ae3cb0bd78cd2ff460a (patch) | |
| tree | c606d14f9413353d99f0eb245bba843700b4ea4f /src/mongo/dbtests/matchertests.cpp | |
| parent | 0dd9c69f2352958ee2905505a541b47027c4ce4f (diff) | |
| download | mongo-f6f104dac1959e4294e26ae3cb0bd78cd2ff460a.tar.gz | |
attempt to fix Windows build
tr1 contains boost's shared pointer and thus the symbol names conflict
unless you explicitly scope them. "using boost::shared_ptr" isn't sufficient.
Diffstat (limited to 'src/mongo/dbtests/matchertests.cpp')
| -rw-r--r-- | src/mongo/dbtests/matchertests.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/mongo/dbtests/matchertests.cpp b/src/mongo/dbtests/matchertests.cpp index 2e7a23c4e64..01a9dc6ac57 100644 --- a/src/mongo/dbtests/matchertests.cpp +++ b/src/mongo/dbtests/matchertests.cpp @@ -27,8 +27,6 @@ namespace MatcherTests { - using boost::shared_ptr; - class CollectionBase { public: CollectionBase() : @@ -165,7 +163,7 @@ namespace MatcherTests { CoveredIndexMatcher matcher( BSON( "a.b" << 1 ), BSON( "$natural" << 1 ) ); MatchDetails details; details.requestElemMatchKey(); - shared_ptr<Cursor> cursor = NamespaceDetailsTransient::getCursor( ns(), BSONObj() ); + boost::shared_ptr<Cursor> cursor = NamespaceDetailsTransient::getCursor( ns(), BSONObj() ); // Verify that the cursor is unindexed. ASSERT_EQUALS( "BasicCursor", cursor->toString() ); ASSERT( matcher.matchesCurrent( cursor.get(), &details ) ); @@ -190,7 +188,7 @@ namespace MatcherTests { CoveredIndexMatcher matcher( query, BSON( "a.b" << 1 ) ); MatchDetails details; details.requestElemMatchKey(); - shared_ptr<Cursor> cursor = NamespaceDetailsTransient::getCursor( ns(), query ); + boost::shared_ptr<Cursor> cursor = NamespaceDetailsTransient::getCursor( ns(), query ); // Verify that the cursor is indexed. ASSERT_EQUALS( "BtreeCursor a.b_1", cursor->toString() ); ASSERT( matcher.matchesCurrent( cursor.get(), &details ) ); @@ -216,7 +214,7 @@ namespace MatcherTests { CoveredIndexMatcher matcher( query, BSON( "a.b" << 1 ) ); MatchDetails details; details.requestElemMatchKey(); - shared_ptr<Cursor> cursor = NamespaceDetailsTransient::getCursor( ns(), query ); + boost::shared_ptr<Cursor> cursor = NamespaceDetailsTransient::getCursor( ns(), query ); // Verify that the cursor is indexed. ASSERT_EQUALS( "BtreeCursor a.b_1", cursor->toString() ); // Verify that the cursor is not multikey. |