summaryrefslogtreecommitdiff
path: root/src/mongo/stdx
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2015-01-03 10:55:42 -0500
committerAndrew Morrow <acm@mongodb.com>2015-02-13 13:01:12 -0500
commit05d73815c390e344842ac8870acfea53498279ea (patch)
treef47dd823f6b7982df32480eb14c5834277fd72ce /src/mongo/stdx
parentc1b5595b5fdf93e0599bbdd4154f35bfa10fadd1 (diff)
downloadmongo-05d73815c390e344842ac8870acfea53498279ea.tar.gz
SERVER-16559 Require C++11 and remove conditional compilation
Diffstat (limited to 'src/mongo/stdx')
-rw-r--r--src/mongo/stdx/functional.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/mongo/stdx/functional.h b/src/mongo/stdx/functional.h
index 8ed0a746d73..a0e6079cac4 100644
--- a/src/mongo/stdx/functional.h
+++ b/src/mongo/stdx/functional.h
@@ -28,7 +28,13 @@
#pragma once
-#if __cplusplus >= 201103L
+// As of VS2013, the Windows STL still doesn't have an adequate implementation
+// of std::function.
+//
+// See https://connect.microsoft.com/VisualStudio/feedback/details/768899/std-function-not-compiling-in-vs2012
+//
+// The bug is fixed in VS2015.
+#if !defined(_MSC_VER) || (_MSC_VER > 1800)
#include <functional>