diff options
author | Eliot Horowitz <eliot@10gen.com> | 2012-10-15 21:59:24 -0400 |
---|---|---|
committer | Eliot Horowitz <eliot@10gen.com> | 2012-10-16 10:35:38 -0400 |
commit | 3e32f363eb493974f50fc6b4f5b300504c12f673 (patch) | |
tree | c168710319cfc01e6fbdd1dc34d37ff288a27254 | |
parent | 317272e1fee6d932c084df930f46fb2c669c1988 (diff) | |
download | mongo-3e32f363eb493974f50fc6b4f5b300504c12f673.tar.gz |
fix whitespace/indent and turn on
-rw-r--r-- | buildscripts/lint.py | 1 | ||||
-rw-r--r-- | src/mongo/db/repl/bgsync.cpp | 2 | ||||
-rw-r--r-- | src/mongo/dbtests/btreetests.cpp | 6 | ||||
-rw-r--r-- | src/mongo/scripting/bson_template_evaluator.cpp | 2 | ||||
-rw-r--r-- | src/mongo/util/map_util.h | 8 |
5 files changed, 9 insertions, 10 deletions
diff --git a/buildscripts/lint.py b/buildscripts/lint.py index 585f8ccd274..213ec36cd1b 100644 --- a/buildscripts/lint.py +++ b/buildscripts/lint.py @@ -40,7 +40,6 @@ def run_lint( paths, nudgeOn=False ): later.append( '-whitespace/comma' ) # errors found: 621 later.append( '-whitespace/comments' ) # errors found: 2189 later.append( '-whitespace/end_of_line' ) # errors found: 4340 - nudge.append( '-whitespace/indent' ) # errors found: 8 later.append( '-whitespace/labels' ) # errors found: 58 later.append( '-whitespace/line_length' ) # errors found: 14500 later.append( '-whitespace/newline' ) # errors found: 1520 diff --git a/src/mongo/db/repl/bgsync.cpp b/src/mongo/db/repl/bgsync.cpp index c420cae4fc4..9214c19c121 100644 --- a/src/mongo/db/repl/bgsync.cpp +++ b/src/mongo/db/repl/bgsync.cpp @@ -526,7 +526,7 @@ namespace replset { _lastH = theReplSet->lastH; LOG(1) << "replset bgsync fetch queue set to: " << _lastOpTimeFetched << " " << _lastH << rsLog; - } + } } // namespace replset } // namespace mongo diff --git a/src/mongo/dbtests/btreetests.cpp b/src/mongo/dbtests/btreetests.cpp index 0057b165f74..3f8ab41fcd9 100644 --- a/src/mongo/dbtests/btreetests.cpp +++ b/src/mongo/dbtests/btreetests.cpp @@ -32,7 +32,7 @@ #define testName "btree" #define BTVERSION 0 namespace BtreeTests0 { - #include "btreetests.inl" +#include "btreetests.inl" } #undef BtreeBucket @@ -48,7 +48,7 @@ namespace BtreeTests0 { #undef BTVERSION #define BTVERSION 1 namespace BtreeTests1 { - #include "btreetests.inl" +#include "btreetests.inl" } #undef testName @@ -56,5 +56,5 @@ namespace BtreeTests1 { #define TESTTWOSTEP 1 namespace BtreeTests2 { - #include "btreetests.inl" +#include "btreetests.inl" } diff --git a/src/mongo/scripting/bson_template_evaluator.cpp b/src/mongo/scripting/bson_template_evaluator.cpp index 7e119fe2619..dabc21d390f 100644 --- a/src/mongo/scripting/bson_template_evaluator.cpp +++ b/src/mongo/scripting/bson_template_evaluator.cpp @@ -80,7 +80,7 @@ namespace mongo { if (st != StatusSuccess) return st; return StatusSuccess; - } + } BsonTemplateEvaluator::Status BsonTemplateEvaluator::evalRandInt(BsonTemplateEvaluator* btl, const char* fieldName, diff --git a/src/mongo/util/map_util.h b/src/mongo/util/map_util.h index 33579f4ede1..c2d3d921bf5 100644 --- a/src/mongo/util/map_util.h +++ b/src/mongo/util/map_util.h @@ -24,10 +24,10 @@ namespace mongo { */ template <typename M, typename K, typename V> V mapFindWithDefault(const M& myMap, const K& key, const V& defaultValue) { - typename M::const_iterator it = myMap.find(key); - if(it == myMap.end()) - return defaultValue; - return it->second; + typename M::const_iterator it = myMap.find(key); + if(it == myMap.end()) + return defaultValue; + return it->second; } } // end namespace |