0
0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00

Merge branch 'master' of github.com:mongodb/mongo

This commit is contained in:
Aaron 2010-01-20 18:09:35 -08:00
commit 80385229da

View File

@ -160,9 +160,9 @@ namespace mongo {
// NOTE No validation of passed in object
long long toNumberLongUnsafe( JSObject *o ) {
unsigned long long val =
( (unsigned long long)( getNumber( o , "top" ) ) << 32 ) +
( unsigned )( getNumber( o , "bottom" ) );
uint64_t val =
( (uint64_t)( getNumber( o , "top" ) ) << 32 ) +
( uint32_t)( getNumber( o , "bottom" ) );
return val;
}
@ -565,7 +565,7 @@ namespace mongo {
return OBJECT_TO_JSVAL( o );
}
case NumberLong: {
unsigned long long val = (unsigned long long)e.numberLong();
uint64_t val = (uint64_t)e.numberLong();
JSObject * o = JS_NewObject( _context , &numberlong_class , 0 , 0 );
// using 2 doubles here instead of a single double because certain double
// bit patterns represent undefined values and sm might trash them