diff options
author | Dwight <dwight@10gen.com> | 2011-05-02 14:03:19 -0400 |
---|---|---|
committer | Dwight <dwight@10gen.com> | 2011-05-02 14:03:19 -0400 |
commit | 6f8d8e4ff919d9d606f85d20f96740f0b664f27c (patch) | |
tree | c9d27c5106c5c7f4bbb0797876b7a04f1bf0b450 | |
parent | 2d176b320aed5c2f301723fa370bdb59096307a6 (diff) | |
download | mongo-6f8d8e4ff919d9d606f85d20f96740f0b664f27c.tar.gz |
make fix
-rw-r--r-- | SConstruct | 2 | ||||
-rw-r--r-- | db/index.h | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 9919eecb2e8..ad17a29fb00 100644 --- a/SConstruct +++ b/SConstruct @@ -355,7 +355,7 @@ if has_option( "asio" ): # mongos + mongod files # todo: move some mongod specific stuff out of here -serverOnlyFiles = Split( "util/logfile.cpp util/alignedbuilder.cpp db/mongommf.cpp db/dur.cpp db/durop.cpp db/dur_writetodatafiles.cpp db/dur_preplogbuffer.cpp db/dur_commitjob.cpp db/dur_recover.cpp db/dur_journal.cpp db/query.cpp db/update.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/rs.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/repl/rs_rollback.cpp db/repl/rs_sync.cpp db/repl/rs_initialsync.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/cap.cpp db/matcher_covered.cpp db/dbeval.cpp db/restapi.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/cursor.cpp db/security_commands.cpp db/security.cpp db/queryoptimizer.cpp db/extsort.cpp db/cmdline.cpp" ) +serverOnlyFiles = Split( "db/key.cpp db/btreebuilder.cpp util/logfile.cpp util/alignedbuilder.cpp db/mongommf.cpp db/dur.cpp db/durop.cpp db/dur_writetodatafiles.cpp db/dur_preplogbuffer.cpp db/dur_commitjob.cpp db/dur_recover.cpp db/dur_journal.cpp db/query.cpp db/update.cpp db/introspect.cpp db/btree.cpp db/clientcursor.cpp db/tests.cpp db/repl.cpp db/repl/rs.cpp db/repl/consensus.cpp db/repl/rs_initiate.cpp db/repl/replset_commands.cpp db/repl/manager.cpp db/repl/health.cpp db/repl/heartbeat.cpp db/repl/rs_config.cpp db/repl/rs_rollback.cpp db/repl/rs_sync.cpp db/repl/rs_initialsync.cpp db/oplog.cpp db/repl_block.cpp db/btreecursor.cpp db/cloner.cpp db/namespace.cpp db/cap.cpp db/matcher_covered.cpp db/dbeval.cpp db/restapi.cpp db/dbhelpers.cpp db/instance.cpp db/client.cpp db/database.cpp db/pdfile.cpp db/cursor.cpp db/security_commands.cpp db/security.cpp db/queryoptimizer.cpp db/extsort.cpp db/cmdline.cpp" ) serverOnlyFiles += [ "db/index.cpp" ] + Glob( "db/geo/*.cpp" ) diff --git a/db/index.h b/db/index.h index 398d7a63665..1a5facbe502 100644 --- a/db/index.h +++ b/db/index.h @@ -141,8 +141,10 @@ namespace mongo { BSONElement e = info.obj()["v"]; if( e.type() == NumberInt ) return e._numberInt(); - uassert(10000, "index v field should be Integer type", e.eoo()); - return 0; + // should normally be an int. this is for backward compatibility + int v = e.numberInt(); + uassert(14802, "index v field should be Integer type", v == 0); + return v; } bool unique() const { |