Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merge assert codes and fix mongos linking

  • Loading branch information...
commit 0798086e4ffa65d52b96c5c14a098eb9956a2fbb 1 parent 44ca61e
astaple astaple authored
5 db/index.cpp
View
@@ -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:
2  db/index.h
View
@@ -26,8 +26,6 @@
namespace mongo {
- extern const int DefaultIndexVersionNumber;
-
class IndexInterface {
protected:
virtual ~IndexInterface() { }
7 db/indexkey.cpp
View
@@ -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 );
}
}
2  db/indexkey.h
View
@@ -25,6 +25,8 @@
namespace mongo {
+ extern const int DefaultIndexVersionNumber;
+
class Cursor;
class IndexSpec;
class IndexType; // TODO: this name sucks
Please sign in to comment.
Something went wrong with that request. Please try again.