summaryrefslogtreecommitdiff
path: root/src/third_party/s2/base
diff options
context:
space:
mode:
authorAndrew Morrow <acm@10gen.com>2013-02-28 16:01:02 -0500
committerAndrew Morrow <acm@10gen.com>2013-03-08 11:24:44 -0500
commit5f34f4471c8982ecc1aa8b1b7c4606f8f079fe4c (patch)
treedc14da591a7bc4945f6cfe0439db799b331c529c /src/third_party/s2/base
parenta25c25b030cd2f35db1e0e0e9e32ca9efbc8a5f1 (diff)
downloadmongo-5f34f4471c8982ecc1aa8b1b7c4606f8f079fe4c.tar.gz
Force existence of namespace std in s2 file to placate clang
Diffstat (limited to 'src/third_party/s2/base')
-rwxr-xr-xsrc/third_party/s2/base/strtoint.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/third_party/s2/base/strtoint.cc b/src/third_party/s2/base/strtoint.cc
index a1381183be7..9f898e716d5 100755
--- a/src/third_party/s2/base/strtoint.cc
+++ b/src/third_party/s2/base/strtoint.cc
@@ -5,6 +5,12 @@
//
#include <errno.h>
+
+// 10gen: Include at least one C++ header here so that the absolutely unacceptable 'using
+// namespace std' from port.h actually has a namespace to refer to, since clang at least
+// objects otherwise.
+#include <new>
+
#include "base/port.h"
#include "base/basictypes.h"
#include "base/strtoint.h"