diff options
| author | dwight <dwight@10gen.com> | 2010-07-12 12:00:55 -0400 |
|---|---|---|
| committer | dwight <dwight@10gen.com> | 2010-07-12 12:00:55 -0400 |
| commit | 9b157bfd85eff3c18d10f1814d296ac12aaf193b (patch) | |
| tree | 30a3e02d5110e62cff93c23b415f2ca863a7d0fd /scripting | |
| parent | e2212f4e228f6cc7c289cc029724af811c98b184 (diff) | |
| download | mongo-9b157bfd85eff3c18d10f1814d296ac12aaf193b.tar.gz | |
minor shell later
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/sm_db.cpp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/scripting/sm_db.cpp b/scripting/sm_db.cpp index a88bf8f2c5d..87abd57e1d4 100644 --- a/scripting/sm_db.cpp +++ b/scripting/sm_db.cpp @@ -22,8 +22,8 @@ #include "../util/text.h" #include "../util/hex.h" -#if( BOOST_VERSION >= 1042000 ) -#include <boost/uuid/uuid.hpp> +#if( BOOST_VERSION >= 104200 ) +//#include <boost/uuid/uuid.hpp> #define HAVE_UUID 1 #else ; @@ -592,10 +592,14 @@ namespace mongo { JSBool uuid_constructor( JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval ){ Convertor c( cx ); - if( argc == 0 ) { + if( argc == 0 ) { +#if defined(HAVE_UUID) + //uuids::uuid +#else +#endif JS_ReportError( cx , "UUID needs 1 argument -- UUID(hexstr)" ); return JS_FALSE; - } + } else if ( argc == 1 ) { string encoded = c.toString( argv[ 0 ] ); |