SERVER-17309 Replace std::auto_ptr<T> with std::unique_ptr<T>

1 files changed, 49 insertions, 49 deletions

diff --git a/src/mongo/db/matcher/expression_tree_test.cpp b/src/mongo/db/matcher/expression_tree_test.cpp
index 27516ff4344..72e9766404a 100644
--- a/src/mongo/db/matcher/expression_tree_test.cpp
+++ b/src/mongo/db/matcher/expression_tree_test.cpp
@@ -38,11 +38,11 @@
 
 namespace mongo {
 
-    using std::auto_ptr;
+    using std::unique_ptr;
 
     TEST( NotMatchExpression, MatchesScalar ) {
         BSONObj baseOperand = BSON( "$lt" << 5 );
-        auto_ptr<ComparisonMatchExpression> lt( new LTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> lt( new LTMatchExpression() );
         ASSERT( lt->init( "a", baseOperand[ "$lt" ] ).isOK() );
         NotMatchExpression notOp;
         ASSERT( notOp.init( lt.release() ).isOK() );
@@ -52,7 +52,7 @@ namespace mongo {
 
     TEST( NotMatchExpression, MatchesArray ) {
         BSONObj baseOperand = BSON( "$lt" << 5 );
-        auto_ptr<ComparisonMatchExpression> lt( new LTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> lt( new LTMatchExpression() );
         ASSERT( lt->init( "a", baseOperand[ "$lt" ] ).isOK() );
         NotMatchExpression notOp;
         ASSERT( notOp.init( lt.release() ).isOK() );
@@ -64,7 +64,7 @@ namespace mongo {
 
     TEST( NotMatchExpression, ElemMatchKey ) {
         BSONObj baseOperand = BSON( "$lt" << 5 );
-        auto_ptr<ComparisonMatchExpression> lt( new LTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> lt( new LTMatchExpression() );
         ASSERT( lt->init( "a", baseOperand[ "$lt" ] ).isOK() );
         NotMatchExpression notOp;
         ASSERT( notOp.init( lt.release() ).isOK() );
@@ -81,7 +81,7 @@ namespace mongo {
     /*
       TEST( NotMatchExpression, MatchesIndexKey ) {
       BSONObj baseOperand = BSON( "$lt" << 5 );
-      auto_ptr<ComparisonMatchExpression> lt( new ComparisonMatchExpression() );
+      unique_ptr<ComparisonMatchExpression> lt( new ComparisonMatchExpression() );
       ASSERT( lt->init( "a", baseOperand[ "$lt" ] ).isOK() );
       NotMatchExpression notOp;
       ASSERT( notOp.init( lt.release() ).isOK() );
@@ -97,7 +97,7 @@ namespace mongo {
         BSONObj baseOperand = BSON( "$lt" << 5 );
         BSONObj match = BSON( "a" << 4 );
         BSONObj notMatch = BSON( "a" << 5 );
-        auto_ptr<ComparisonMatchExpression> lt( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> lt( new ComparisonMatchExpression() );
         ASSERT( lt->init( "", baseOperand[ "$lt" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( lt.release() );
@@ -121,11 +121,11 @@ namespace mongo {
         BSONObj notMatch2 = BSON( "a" << "a1" );
         BSONObj notMatch3 = BSON( "a" << "r" );
 
-        auto_ptr<ComparisonMatchExpression> sub1( new LTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new LTMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$lt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new GTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new GTMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$gt" ] ).isOK() );
-        auto_ptr<RegexMatchExpression> sub3( new RegexMatchExpression() );
+        unique_ptr<RegexMatchExpression> sub3( new RegexMatchExpression() );
         ASSERT( sub3->init( "a", "1", "" ).isOK() );
 
         AndMatchExpression andOp;
@@ -141,9 +141,9 @@ namespace mongo {
 
     TEST( AndOp, MatchesSingleClause ) {
         BSONObj baseOperand = BSON( "$ne" << 5 );
-        auto_ptr<ComparisonMatchExpression> eq( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> eq( new EqualityMatchExpression() );
         ASSERT( eq->init( "a", baseOperand[ "$ne" ] ).isOK() );
-        auto_ptr<NotMatchExpression> ne( new NotMatchExpression() );
+        unique_ptr<NotMatchExpression> ne( new NotMatchExpression() );
         ASSERT( ne->init( eq.release() ).isOK() );
 
         AndMatchExpression andOp;
@@ -160,13 +160,13 @@ namespace mongo {
         BSONObj baseOperand2 = BSON( "$lt" << 10 );
         BSONObj baseOperand3 = BSON( "$lt" << 100 );
 
-        auto_ptr<ComparisonMatchExpression> sub1( new GTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new GTMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$gt" ] ).isOK() );
 
-        auto_ptr<ComparisonMatchExpression> sub2( new LTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new LTMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$lt" ] ).isOK() );
 
-        auto_ptr<ComparisonMatchExpression> sub3( new LTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub3( new LTMatchExpression() );
         ASSERT( sub3->init( "b", baseOperand3[ "$lt" ] ).isOK() );
 
         AndMatchExpression andOp;
@@ -185,10 +185,10 @@ namespace mongo {
         BSONObj baseOperand1 = BSON( "a" << 1 );
         BSONObj baseOperand2 = BSON( "b" << 2 );
 
-        auto_ptr<ComparisonMatchExpression> sub1( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new EqualityMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "a" ] ).isOK() );
 
-        auto_ptr<ComparisonMatchExpression> sub2( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new EqualityMatchExpression() );
         ASSERT( sub2->init( "b", baseOperand2[ "b" ] ).isOK() );
 
         AndMatchExpression andOp;
@@ -212,9 +212,9 @@ namespace mongo {
     TEST( AndOp, MatchesIndexKeyWithoutUnknown ) {
         BSONObj baseOperand1 = BSON( "$gt" << 1 );
         BSONObj baseOperand2 = BSON( "$lt" << 5 );
-        auto_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$gt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$lt" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( sub1.release() );
@@ -235,11 +235,11 @@ namespace mongo {
         BSONObj baseOperand2 = BSON( "$lt" << 5 );
         // This part will return PartialMatchResult_Unknown.
         BSONObj baseOperand3 = BSON( "$ne" << 5 );
-        auto_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$gt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$lt" ] ).isOK() );
-        auto_ptr<NeOp> sub3( new NeOp() );
+        unique_ptr<NeOp> sub3( new NeOp() );
         ASSERT( sub3->init( "a", baseOperand3[ "$ne" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( sub1.release() );
@@ -262,7 +262,7 @@ namespace mongo {
         BSONObj baseOperand = BSON( "$lt" << 5 );
         BSONObj match = BSON( "a" << 4 );
         BSONObj notMatch = BSON( "a" << 5 );
-        auto_ptr<ComparisonMatchExpression> lt( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> lt( new ComparisonMatchExpression() );
         ASSERT( lt->init( "a", baseOperand[ "$lt" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( lt.release() );
@@ -286,11 +286,11 @@ namespace mongo {
         BSONObj match2 = BSON( "a" << 11 );
         BSONObj match3 = BSON( "a" << 5 );
         BSONObj notMatch = BSON( "a" << "6" );
-        auto_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$lt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$gt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub3( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub3( new ComparisonMatchExpression() );
         ASSERT( sub3->init( "a", baseOperand3[ "a" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( sub1.release() );
@@ -306,9 +306,9 @@ namespace mongo {
     */
     TEST( OrOp, MatchesSingleClause ) {
         BSONObj baseOperand = BSON( "$ne" << 5 );
-        auto_ptr<ComparisonMatchExpression> eq( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> eq( new EqualityMatchExpression() );
         ASSERT( eq->init( "a", baseOperand[ "$ne" ] ).isOK() );
-        auto_ptr<NotMatchExpression> ne( new NotMatchExpression() );
+        unique_ptr<NotMatchExpression> ne( new NotMatchExpression() );
         ASSERT( ne->init( eq.release() ).isOK() );
 
         OrMatchExpression orOp;
@@ -324,11 +324,11 @@ namespace mongo {
         BSONObj baseOperand1 = BSON( "$gt" << 10 );
         BSONObj baseOperand2 = BSON( "$lt" << 0 );
         BSONObj baseOperand3 = BSON( "b" << 100 );
-        auto_ptr<ComparisonMatchExpression> sub1( new GTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new GTMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$gt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new LTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new LTMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$lt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub3( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub3( new EqualityMatchExpression() );
         ASSERT( sub3->init( "b", baseOperand3[ "b" ] ).isOK() );
 
         OrMatchExpression orOp;
@@ -348,9 +348,9 @@ namespace mongo {
     TEST( OrOp, ElemMatchKey ) {
         BSONObj baseOperand1 = BSON( "a" << 1 );
         BSONObj baseOperand2 = BSON( "b" << 2 );
-        auto_ptr<ComparisonMatchExpression> sub1( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new EqualityMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "a" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new EqualityMatchExpression() );
         ASSERT( sub2->init( "b", baseOperand2[ "b" ] ).isOK() );
 
         OrMatchExpression orOp;
@@ -374,9 +374,9 @@ namespace mongo {
     TEST( OrOp, MatchesIndexKeyWithoutUnknown ) {
         BSONObj baseOperand1 = BSON( "$gt" << 5 );
         BSONObj baseOperand2 = BSON( "$lt" << 1 );
-        auto_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$gt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$lt" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( sub1.release() );
@@ -397,11 +397,11 @@ namespace mongo {
         BSONObj baseOperand2 = BSON( "$lt" << 1 );
         // This part will return PartialMatchResult_Unknown.
         BSONObj baseOperand3 = BSON( "$ne" << 5 );
-        auto_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$gt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$lt" ] ).isOK() );
-        auto_ptr<NeOp> sub3( new NeOp() );
+        unique_ptr<NeOp> sub3( new NeOp() );
         ASSERT( sub3->init( "a", baseOperand3[ "$ne" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( sub1.release() );
@@ -424,7 +424,7 @@ namespace mongo {
         BSONObj baseOperand = BSON( "$lt" << 5 );
         BSONObj match = BSON( "a" << 5 );
         BSONObj notMatch = BSON( "a" << 4 );
-        auto_ptr<ComparisonMatchExpression> lt( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> lt( new ComparisonMatchExpression() );
         ASSERT( lt->init( "a", baseOperand[ "$lt" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( lt.release() );
@@ -448,11 +448,11 @@ namespace mongo {
         BSONObj notMatch2 = BSON( "a" << 11 );
         BSONObj notMatch3 = BSON( "a" << 5 );
         BSONObj match = BSON( "a" << "6" );
-        auto_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new ComparisonMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$lt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new ComparisonMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$gt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub3( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub3( new ComparisonMatchExpression() );
         ASSERT( sub3->init( "a", baseOperand3[ "a" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( sub1.release() );
@@ -469,9 +469,9 @@ namespace mongo {
 
     TEST( NorOp, MatchesSingleClause ) {
         BSONObj baseOperand = BSON( "$ne" << 5 );
-        auto_ptr<ComparisonMatchExpression> eq( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> eq( new EqualityMatchExpression() );
         ASSERT( eq->init( "a", baseOperand[ "$ne" ] ).isOK() );
-        auto_ptr<NotMatchExpression> ne( new NotMatchExpression() );
+        unique_ptr<NotMatchExpression> ne( new NotMatchExpression() );
         ASSERT( ne->init( eq.release() ).isOK() );
 
         NorMatchExpression norOp;
@@ -488,11 +488,11 @@ namespace mongo {
         BSONObj baseOperand2 = BSON( "$lt" << 0 );
         BSONObj baseOperand3 = BSON( "b" << 100 );
 
-        auto_ptr<ComparisonMatchExpression> sub1( new GTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new GTMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "$gt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new LTMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new LTMatchExpression() );
         ASSERT( sub2->init( "a", baseOperand2[ "$lt" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub3( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub3( new EqualityMatchExpression() );
         ASSERT( sub3->init( "b", baseOperand3[ "b" ] ).isOK() );
 
         NorMatchExpression norOp;
@@ -512,9 +512,9 @@ namespace mongo {
     TEST( NorOp, ElemMatchKey ) {
         BSONObj baseOperand1 = BSON( "a" << 1 );
         BSONObj baseOperand2 = BSON( "b" << 2 );
-        auto_ptr<ComparisonMatchExpression> sub1( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub1( new EqualityMatchExpression() );
         ASSERT( sub1->init( "a", baseOperand1[ "a" ] ).isOK() );
-        auto_ptr<ComparisonMatchExpression> sub2( new EqualityMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> sub2( new EqualityMatchExpression() );
         ASSERT( sub2->init( "b", baseOperand2[ "b" ] ).isOK() );
 
         NorMatchExpression norOp;
@@ -557,7 +557,7 @@ namespace mongo {
     /**
     TEST( NorOp, MatchesIndexKey ) {
         BSONObj baseOperand = BSON( "a" << 5 );
-        auto_ptr<ComparisonMatchExpression> eq( new ComparisonMatchExpression() );
+        unique_ptr<ComparisonMatchExpression> eq( new ComparisonMatchExpression() );
         ASSERT( eq->init( "a", baseOperand[ "a" ] ).isOK() );
         OwnedPointerVector<MatchMatchExpression> subMatchExpressions;
         subMatchExpressions.mutableVector().push_back( eq.release() );