Use more common (and readable) names for branch prediction hints

3 files changed, 8 insertions, 8 deletions

diff --git a/bson/bson-inl.h b/bson/bson-inl.h
index 0a0601cf08a..b86d66784ed 100644
--- a/bson/bson-inl.h
+++ b/bson/bson-inl.h
@@ -172,7 +172,7 @@ dodouble:
     }
 
     inline BSONObj BSONElement::embeddedObjectUserCheck() const {
-        MONGOIF ( isABSONObj() )
+        if ( MONGO_likely(isABSONObj()) )
             return BSONObj(value());
         stringstream ss;
         ss << "invalid parameter: expected an object (" << fieldName() << ")";
diff --git a/bson/bsonobjiterator.h b/bson/bsonobjiterator.h
index 4a8b2751abc..39ae24d9b86 100644
--- a/bson/bsonobjiterator.h
+++ b/bson/bsonobjiterator.h
@@ -37,7 +37,7 @@ namespace mongo {
         */
         BSONObjIterator(const BSONObj& jso) {
             int sz = jso.objsize();
-            MONGO_IF ( sz == 0 ) {
+            if ( MONGO_unlikely(sz == 0) ) {
                 _pos = _theend = 0;
                 return;
             }
diff --git a/bson/inline_decls.h b/bson/inline_decls.h
index 067affaabd9..30da9b4560d 100644
--- a/bson/inline_decls.h
+++ b/bson/inline_decls.h
@@ -37,11 +37,11 @@ namespace mongo {
 
 #if !defined(__GNUC__)
 
-// branch prediction.  indicate we expect to enter the if statement body
-# define MONGOIF(x) if( (x) )
+// branch prediction.  indicate we expect to be true
+# define MONGO_likely(x) ((bool)(x))
 
-// branch prediction.  indicate we expect to not enter the if statement body
-# define MONGO_IF(x) if( (x) )
+// branch prediction.  indicate we expect to be false
+# define MONGO_unlikely(x) ((bool)(x))
 
 # if defined(_WIN32)
     // prefetch data from memory
@@ -56,8 +56,8 @@ namespace mongo {
 
 #else
 
-# define MONGOIF(x) if( __builtin_expect((x), 1) )
-# define MONGO_IF(x) if( __builtin_expect((x), 0) )
+# define MONGO_likely(x) ( __builtin_expect((bool)(x), 1) )
+# define MONGO_unlikely(x) ( __builtin_expect((bool)(x), 0) )
 
     inline void prefetch(void *p) { 
         __builtin_prefetch(p);