Merge branch 'master' of github.com:mongodb/mongo

1 files changed, 1 insertions, 5 deletions

diff --git a/db/namespace.h b/db/namespace.h
index c9192294f35..3353eef23e8 100644
--- a/db/namespace.h
+++ b/db/namespace.h
@@ -283,8 +283,7 @@ namespace mongo {
                  this isn't thread safe.  TODO
         */
         enum NamespaceFlags {
-            Flag_HaveIdIndex = 1 << 0, // set when we have _id index (ONLY if ensureIdIndex was called -- 0 if that has never been called)
-            Flag_CappedDisallowDelete = 1 << 1 // set when deletes not allowed during capped table allocation.
+            Flag_HaveIdIndex = 1 << 0 // set when we have _id index (ONLY if ensureIdIndex was called -- 0 if that has never been called)
         };
 
         IndexDetails& idx(int idxNo) {
@@ -358,8 +357,6 @@ namespace mongo {
 
         void aboutToDeleteAnIndex() { flags &= ~Flag_HaveIdIndex;  }
 
-        void cappedDisallowDelete() { flags |= Flag_CappedDisallowDelete; }
-        
         /* returns index of the first index in which the field is present. -1 if not present. */
         int fieldIsIndexed(const char *fieldName);
 
@@ -446,7 +443,6 @@ namespace mongo {
             so there will be no wrap around, just an exception.  Used to be 

             used by the temp oplogs that were part of the cloneCollection implementation. 

             */
-        bool cappedMayDelete() const { return !( flags & Flag_CappedDisallowDelete ); }
         Extent *theCapExtent() const { return capExtent.ext(); }
         void advanceCapExtent( const char *ns );
         void maybeComplain( const char *ns, int len ) const;