Ticket #40875: patch-mavericks.diff

mongo/platform/unordered_map.h

@@ -15 +15 @@
 
 #pragma once
 
+//  Need for _LIBCPP_VERSION
+#include <ciso646>
+
 // NOTE(acm): Before gcc-4.7, __cplusplus is always defined to be 1,
 // so we can't reliably detect C++11 support by exclusively checking
 // the value of __cplusplus.
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_LIBCPP_VERSION)
 
 #include <unordered_map>
 

mongo/platform/unordered_set.h

@@ -15 +15 @@
 
 #pragma once
 
+//  Need for _LIBCPP_VERSION
+#include <ciso646>
+
 // NOTE(acm): Before gcc-4.7, __cplusplus is always defined to be 1,
 // so we can't reliably detect C++11 support by exclusively checking
 // the value of __cplusplus.
-#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__) || defined(_LIBCPP_VERSION)
 
 #include <unordered_set>
 

third_party/s2/hash.h

@@ -7 +7 @@
 #include "mongo/platform/unordered_set.h"
 #define hash_set mongo::unordered_set
 
-#if defined OS_LINUX || defined OS_MACOSX || defined __sunos__ || defined __freebsd__
-#define HASH_NAMESPACE_START namespace std { namespace tr1 {
-#define HASH_NAMESPACE_END }}
-#elif defined OS_WINDOWS
+#if (defined(OS_MACOSX) && defined(_LIBCPP_VERSION)) || defined(OS_WINDOWS)
 #define HASH_NAMESPACE_START namespace std {
 #define HASH_NAMESPACE_END }
+#elif defined OS_LINUX || defined OS_MACOSX || defined __sunos__ || defined __freebsd__ 
+#define HASH_NAMESPACE_START namespace std { namespace tr1 {
+#define HASH_NAMESPACE_END }}
 #endif
 
 // Places that hash-related functions are defined:

mongo/db/fts/stemmer.cpp

@@ -17 +17 @@
 */
 
 #include <string>
+#include <cstdlib>
 
 #include "mongo/db/fts/stemmer.h"
 

mongo/dbtests/documentsourcetests.cpp

@@ -583 +583 @@
         };
 
         struct ValueCmp {
-            bool operator()(const Value& a, const Value& b) {
+            bool operator()(const Value& a, const Value& b) const {
                 return Value::compare( a, b ) < 0;
             }
         };