diff --git a/db/dur_commitjob.cpp b/db/dur_commitjob.cpp index abd51337ea9..a5b2658f865 100644 --- a/db/dur_commitjob.cpp +++ b/db/dur_commitjob.cpp @@ -38,7 +38,7 @@ namespace mongo { _ops.clear(); } - void Writes::insert(WriteIntent& wi){ + void Writes::insertWriteIntent(WriteIntent& wi){ if (_writes.empty()){ _writes.insert(wi); return; diff --git a/db/dur_commitjob.h b/db/dur_commitjob.h index de00a151434..b80b473fa76 100644 --- a/db/dur_commitjob.h +++ b/db/dur_commitjob.h @@ -102,7 +102,9 @@ namespace mongo { /** reset the Writes structure (empties all the above) */ void clear(); - void insert(WriteIntent& wi); // merges into set + + /** merges into set */ + void insertWriteIntent(WriteIntent& wi); #ifdef _DEBUG WriteIntent _last; @@ -215,7 +217,7 @@ namespace mongo { #endif // remember intent. we will journal it in a bit - _wi.insert(w); + _wi.insertWriteIntent(w); _bytes += w.len; wassert( _wi._writes.size() < 2000000 ); assert( _wi._writes.size() < 20000000 );