fix compile and error codes

4 files changed, 11 insertions, 8 deletions

diff --git a/s/commands_public.cpp b/s/commands_public.cpp
index 78eaf79e8dc..bf6d7592d99 100644
--- a/s/commands_public.cpp
+++ b/s/commands_public.cpp
@@ -25,6 +25,7 @@
 #include "../db/commands.h"
 #include "../db/query.h"
 #include "../db/queryutil.h"
+#include "../scripting/engine.h"
 
 #include "config.h"
 #include "chunk.h"
diff --git a/s/mr_shard.cpp b/s/mr_shard.cpp
index 44a43a2c785..1659ac540e5 100644
--- a/s/mr_shard.cpp
+++ b/s/mr_shard.cpp
@@ -18,6 +18,7 @@
 #include "pch.h"
 #include "../util/message.h"
 #include "../db/dbmessage.h"
+#include "../scripting/engine.h"
 
 #include "mr_shard.h"
 
@@ -41,7 +42,7 @@ namespace mongo {
             _scope->init( &_wantedScope );
 
             _func = _scope->createFunction( _code.c_str() );
-            uassert( 14814 , str::stream() << "couldn't compile code for: " << _type , _func );
+            uassert( 14836 , str::stream() << "couldn't compile code for: " << _type , _func );
 
             // install in JS scope so that it can be called in JS mode
             _scope->setFunction(_type.c_str(), _code.c_str());
@@ -145,7 +146,7 @@ namespace mongo {
 
                 BSONElement ee = j.next();
 
-                uassert( 14815 , "value too large to reduce" , ee.size() < ( BSONObjMaxUserSize / 2 ) );
+                uassert( 14837 , "value too large to reduce" , ee.size() < ( BSONObjMaxUserSize / 2 ) );
 
                 if ( sizeSoFar + ee.size() > BSONObjMaxUserSize ) {
                     assert( n > 1 ); // if not, inf. loop
@@ -165,7 +166,7 @@ namespace mongo {
             ++numReduces;
 
             if ( s->type( "return" ) == Array ) {
-                uasserted( 14816 , "reduce -> multiple not supported yet");
+                uasserted( 14838 , "reduce -> multiple not supported yet");
                 return;
             }
 
@@ -199,7 +200,7 @@ namespace mongo {
             reduceTriggerRatio = 2.0;
             maxInMemSize = 5 * 1024 * 1024;
 
-            uassert( 14819 , "outType is no longer a valid option" , cmdObj["outType"].eoo() );
+            uassert( 14841 , "outType is no longer a valid option" , cmdObj["outType"].eoo() );
 
             if ( cmdObj["out"].type() == String ) {
                 finalShort = cmdObj["out"].String();
@@ -227,7 +228,7 @@ namespace mongo {
                     outType = INMEMORY;
                 }
                 else {
-                    uasserted( 14817 , str::stream() << "unknown out specifier [" << t << "]" );
+                    uasserted( 14839 , str::stream() << "unknown out specifier [" << t << "]" );
                 }
 
                 if (o.hasElement("db")) {
@@ -235,7 +236,7 @@ namespace mongo {
                 }
             }
             else {
-                uasserted( 14818 , "'out' has to be a string or an object" );
+                uasserted( 14840 , "'out' has to be a string or an object" );
             }
 
             if ( outType != INMEMORY ) { // setup names
diff --git a/s/server.cpp b/s/server.cpp
index 48e284523af..bac19945a51 100644
--- a/s/server.cpp
+++ b/s/server.cpp
@@ -27,6 +27,7 @@
 #include "../util/signal_handlers.h"
 #include "../util/admin_access.h"
 #include "../db/dbwebserver.h"
+#include "../scripting/engine.h"
 
 #include "server.h"
 #include "request.h"
diff --git a/s/strategy_shard.cpp b/s/strategy_shard.cpp
index 600ded54799..6f56c777ca2 100644
--- a/s/strategy_shard.cpp
+++ b/s/strategy_shard.cpp
@@ -207,7 +207,7 @@ namespace mongo {
 
                 if ( bad ) {
                     log() << "tried to insert object without shard key: " << ns << "  " << o << endl;
-                    uasserted( 14812 , "tried to insert object without shard key" );
+                    uasserted( 14842 , "tried to insert object without shard key" );
                 }
 
             }
@@ -241,7 +241,7 @@ namespace mongo {
                     LOG( logLevel ) << "  sequenece number - old: " << old << " new: " << manager->getSequenceNumber() << endl;
 
                     if (!manager) {
-                        uasserted(14813, "collection no longer sharded");
+                        uasserted(14843, "collection no longer sharded");
                     }
                 }
                 sleepmillis( i * 20 );