diff options
author | Eliot Horowitz <eliot@10gen.com> | 2010-03-18 21:22:49 -0400 |
---|---|---|
committer | Eliot Horowitz <eliot@10gen.com> | 2010-03-18 21:22:49 -0400 |
commit | d3f56501c0bedf9136271c735e185ef97ed48902 (patch) | |
tree | db2fed8893f735202363df4809c6d0a8bf247869 | |
parent | f9d00c910683fa9aff316f543ab016f8b65ce200 (diff) | |
download | mongo-d3f56501c0bedf9136271c735e185ef97ed48902.tar.gz |
slight fix to any - but stil very broken
-rw-r--r-- | db/db.cpp | 2 | ||||
-rw-r--r-- | db/jsobj.cpp | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/db/db.cpp b/db/db.cpp index 4731bcccb2f..ce9127b0da5 100644 --- a/db/db.cpp +++ b/db/db.cpp @@ -657,7 +657,7 @@ int main(int argc, char* argv[], char *envp[] ) ("slavedelay", po::value<int>(), "specify delay (in seconds) to be used when applying master ops to slave") ("fastsync", "indicate that this instance is starting from a dbpath snapshot of the repl peer") ("autoresync", "automatically resync if slave data is stale") - ("oplogSize", po::value<long>(), "size limit (in MB) for op log") + ("oplogSize", po::value<int>(), "size limit (in MB) for op log") ("opIdMem", po::value<long>(), "size limit (in bytes) for in memory storage of op ids") ; diff --git a/db/jsobj.cpp b/db/jsobj.cpp index 3277a650c28..636c740447b 100644 --- a/db/jsobj.cpp +++ b/db/jsobj.cpp @@ -1633,7 +1633,6 @@ namespace mongo { void BSONObjBuilder::appendAny(const char* fieldName, const boost::any& val){ massert(13070, "any can't be empty", !val.empty()); - const type_info& type = val.type(); #define CONVERT(T) \ @@ -1658,11 +1657,11 @@ namespace mongo { CONVERT(vector<const char *>) CONVERT(vector<BSONObj>) #undef CONVERT - + ; // TODO maybe demangle type.name() - massert(13071, string("any is not of a recognized type: ") + type.name() , false); + massert(13071, string("any is not of a recognized type: ") + type.name() + " fieldName: " + fieldName , false); } - + int BSONElementFieldSorter( const void * a , const void * b ){ const char * x = *((const char**)a); const char * y = *((const char**)b); |