Permalink
Browse files

merge assert codes and fix mongos linking

  • Loading branch information...
1 parent 44ca61e commit 0798086e4ffa65d52b96c5c14a098eb9956a2fbb @astaple astaple committed Jul 31, 2011
Showing with 8 additions and 8 deletions.
  1. +0 −5 db/index.cpp
  2. +0 −2 db/index.h
  3. +6 −1 db/indexkey.cpp
  4. +2 −0 db/indexkey.h
View
5 db/index.cpp
@@ -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
2 db/index.h
@@ -26,8 +26,6 @@
namespace mongo {
- extern const int DefaultIndexVersionNumber;
-
class IndexInterface {
protected:
virtual ~IndexInterface() { }
View
7 db/indexkey.cpp
@@ -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
2 db/indexkey.h
@@ -25,6 +25,8 @@
namespace mongo {
+ extern const int DefaultIndexVersionNumber;
+
class Cursor;
class IndexSpec;
class IndexType; // TODO: this name sucks

0 comments on commit 0798086

Please sign in to comment.