summaryrefslogtreecommitdiff
path: root/src/mongo/db/catalog
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-04-24 17:44:20 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2014-04-26 09:44:01 -0400
commit381a35be63129419516c77825c2a27e7fc447e63 (patch)
tree90285bbc743edac9f5354bd308cc65498cde8d15 /src/mongo/db/catalog
parentbced3d215a395fa2872b9931d971fef7138d3e94 (diff)
downloadmongo-381a35be63129419516c77825c2a27e7fc447e63.tar.gz
SERVER-13632 Get rid of DiskLoc::obj (Part 1)
DiskLoc::obj references the durability subsystem through thread local variables. With this change the accesses become explicit through the collection.
Diffstat (limited to 'src/mongo/db/catalog')
-rw-r--r--src/mongo/db/catalog/collection.cpp2
-rw-r--r--src/mongo/db/catalog/collection.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/mongo/db/catalog/collection.cpp b/src/mongo/db/catalog/collection.cpp
index c11d6172b0b..062f88d9faa 100644
--- a/src/mongo/db/catalog/collection.cpp
+++ b/src/mongo/db/catalog/collection.cpp
@@ -155,7 +155,7 @@ namespace mongo {
return count;
}
- BSONObj Collection::docFor( const DiskLoc& loc ) {
+ BSONObj Collection::docFor(const DiskLoc& loc) const {
Record* rec = _recordStore->recordFor( loc );
return BSONObj( rec->accessed()->data() );
}
diff --git a/src/mongo/db/catalog/collection.h b/src/mongo/db/catalog/collection.h
index c05f7cbe112..d12af68011b 100644
--- a/src/mongo/db/catalog/collection.h
+++ b/src/mongo/db/catalog/collection.h
@@ -132,7 +132,7 @@ namespace mongo {
bool requiresIdIndex() const;
- BSONObj docFor( const DiskLoc& loc );
+ BSONObj docFor(const DiskLoc& loc) const;
// ---- things that should move to a CollectionAccessMethod like thing
/**