merge

1 files changed, 25 insertions, 25 deletions

diff --git a/server.h b/server.h
index 370c63d0c47..781e4ccc24a 100644
--- a/server.h
+++ b/server.h
@@ -1,25 +1,25 @@
-/** @file server.h

-

-    This file contains includes commonly needed in the server files (mongod, mongos, test).  It is NOT included in the C++ client.

-

-    Over time we should move more here, and more out of pch.h.  And get rid of pch.h at some point.

-*/

-

-// todo is there a boost  thign for this already?

-

-#pragma once

-

-#include "bson/inline_decls.h"

-

-/* Note: do not clutter code with these -- ONLY use in hot spots / significant loops. */

-

-// branch prediction.  indicate we expect to enter the if statement body

-#define IF MONGOIF

-

-// branch prediction.  indicate we expect to not enter the if statement body

-#define _IF MONGO_IF

-

-// prefetch data from memory

-#define PREFETCH MONGOPREFETCH

-

-using namespace bson;

+/** @file server.h
+
+    This file contains includes commonly needed in the server files (mongod, mongos, test).  It is NOT included in the C++ client.
+
+    Over time we should move more here, and more out of pch.h.  And get rid of pch.h at some point.
+*/
+
+// todo is there a boost  thign for this already?
+
+#pragma once
+
+#include "bson/inline_decls.h"
+
+/* Note: do not clutter code with these -- ONLY use in hot spots / significant loops. */
+
+// branch prediction.  indicate we expect to be true
+#define likely MONGO_likely
+
+// branch prediction.  indicate we expect to be false
+#define unlikely MONGO_unlikely
+
+// prefetch data from memory
+#define PREFETCH MONGOPREFETCH
+
+using namespace bson;