mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

Compile fixes

Browse Source
This commit is contained in:
Mathias Stearn 2011-06-20 12:02:15 -04:00
parent 870c4e5da5
commit 6ec18b293a
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
db/btree.cpp
View File

@ -913,9 +913,9 @@ namespace mongo {
}
//#define BTREE(loc) (static_cast<DiskLoc>(loc).btree<V>())
#define BTREE(loc) (loc.btree<V>())
#define BTREE(loc) (loc.template btree<V>())
//#define BTREEMOD(loc) (static_cast<DiskLoc>(loc).btreemod<V>())
#define BTREEMOD(loc) (loc.btreemod<V>())
#define BTREEMOD(loc) (loc.template btreemod<V>())
template< class V >
void BtreeBucket<V>::replaceWithNextChild( const DiskLoc thisLoc, IndexDetails &id ) {
@ -930,7 +930,7 @@ namespace mongo {
}
BTREE(this->nextChild)->parent.writing() = this->parent;
(this->nextChild.btree<V>())->parent.writing() = this->parent;
BTREE(this->nextChild)->parent.writing() = this->parent;
//(static_cast<DiskLoc>(this->nextChild).btree<V>())->parent.writing() = this->parent;
ClientCursor::informAboutToDeleteBucket( thisLoc );
deallocBucket( thisLoc, id );

2
db/btree.h
View File

@ -606,6 +606,8 @@ namespace mongo {
typedef typename V::Key Key;
typedef typename V::KeyOwned KeyOwned;
typedef typename BucketBasics<V>::KeyNode KeyNode;
typedef typename BucketBasics<V>::_KeyNode _KeyNode;
typedef typename BucketBasics<V>::Loc Loc;
const _KeyNode& k(int i) const { return static_cast< const BucketBasics<V> * >(this)->k(i); }
protected:
_KeyNode& k(int i) { return static_cast< BucketBasics<V> * >(this)->_k(i); }