From 582fc32574a3b158c81e49cb00e6ae59205e66ba Mon Sep 17 00:00:00 2001 From: Antonin Kral Date: Thu, 17 Mar 2011 00:05:43 +0100 Subject: Imported Upstream version 1.8.0 --- db/driverHelpers.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'db/driverHelpers.cpp') diff --git a/db/driverHelpers.cpp b/db/driverHelpers.cpp index d8971ad..d98a33b 100644 --- a/db/driverHelpers.cpp +++ b/db/driverHelpers.cpp @@ -24,11 +24,11 @@ #include "pch.h" #include "jsobj.h" #include "pdfile.h" -#include "namespace.h" +#include "namespace-inl.h" #include "commands.h" #include "cmdline.h" #include "btree.h" -#include "curop.h" +#include "curop-inl.h" #include "../util/background.h" #include "../scripting/engine.h" @@ -36,18 +36,18 @@ namespace mongo { class BasicDriverHelper : public Command { public: - BasicDriverHelper( const char * name ) : Command( name ){} - + BasicDriverHelper( const char * name ) : Command( name ) {} + virtual LockType locktype() const { return NONE; } virtual bool slaveOk() const { return true; } - virtual bool slaveOverrideOk(){ return true; } + virtual bool slaveOverrideOk() { return true; } }; class ObjectIdTest : public BasicDriverHelper { public: - ObjectIdTest() : BasicDriverHelper( "driverOIDTest" ){} - virtual bool run(const string& , BSONObj& cmdObj, string& errmsg, BSONObjBuilder& result, bool fromRepl){ - if ( cmdObj.firstElement().type() != jstOID ){ + ObjectIdTest() : BasicDriverHelper( "driverOIDTest" ) {} + virtual bool run(const string& , BSONObj& cmdObj, string& errmsg, BSONObjBuilder& result, bool fromRepl) { + if ( cmdObj.firstElement().type() != jstOID ) { errmsg = "not oid"; return false; } -- cgit v1.2.3