0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-11-30 00:56:44 +01:00

merge assert codes and fix mongos linking

This commit is contained in:
Aaron 2011-07-31 09:34:04 -07:00
parent 44ca61eafb
commit 0798086e4f
4 changed files with 8 additions and 8 deletions

View File

@ -27,11 +27,6 @@
namespace mongo {
/** old (<= v1.8) : 0
1 is new version
*/
const int DefaultIndexVersionNumber = 1;
template< class V >
class IndexInterfaceImpl : public IndexInterface {
public:

View File

@ -26,8 +26,6 @@
namespace mongo {
extern const int DefaultIndexVersionNumber;
class IndexInterface {
protected:
virtual ~IndexInterface() { }

View File

@ -26,6 +26,11 @@
namespace mongo {
/** old (<= v1.8) : 0
1 is new version
*/
const int DefaultIndexVersionNumber = 1;
map<string,IndexPlugin*> * IndexPlugin::_plugins;
IndexType::IndexType( const IndexPlugin * plugin , const IndexSpec * spec )
@ -407,7 +412,7 @@ namespace mongo {
break;
}
default:
massert( 15854, "Invalid index version for key generation.", false );
massert( 15869, "Invalid index version for key generation.", false );
}
}

View File

@ -25,6 +25,8 @@
namespace mongo {
extern const int DefaultIndexVersionNumber;
class Cursor;
class IndexSpec;
class IndexType; // TODO: this name sucks