branch prediction gcc

1 files changed, 8 insertions, 12 deletions

diff --git a/bson/inline_decls.h b/bson/inline_decls.h
index e1f819c0d6c..433a67010cb 100644
--- a/bson/inline_decls.h
+++ b/bson/inline_decls.h
@@ -34,25 +34,21 @@
 
 /* Note: do not clutter code with these -- ONLY use in hot spots / significant loops. */
 
-//#if 1
-
-//#if !defined(__GNUC__)
+#if !defined(__GNUC__)
 
 // branch prediction.  indicate we expect to enter the if statement body
-#define MONGOIF(x) if( (x) )
+# define MONGOIF(x) if( (x) )
 
 // branch prediction.  indicate we expect to not enter the if statement body
-#define MONGO_IF(x) if( (x) )
+# define MONGO_IF(x) if( (x) )
 
 // prefetch data from memory
-#define MONGOPREFETCH(x) { /*just check we compile:*/ assert(sizeof(*x)); }
-
-#if 0
+# define MONGOPREFETCH(x) { /*just check we compile:*/ assert(sizeof(*x)); }
 
-#define IF(x) if( __builtin_expect((x), 1) )
-
-#define _IF(x) if( __builtin_expect((x), 0) )
+#else
 
-#define PREFETCH(x) { /*just check we compile:*/ assert(sizeof(*x)); }
+# define MONGOIF(x) if( __builtin_expect((x), 1) )
+# define MONGO_IF(x) if( __builtin_expect((x), 0) )
+# define MONGOPREFETCH(x) { /*just check we compile:*/ assert(sizeof(*x)); }
 
 #endif