Merge to upstream r231255.

Change-Id: Ia8ee1801b42943464b99f28b6a83647458f3efb5
2015-03-04 10:47:52 -08:00
parent 94962fba20
commit 5cb52824fc
424 changed files with 5073 additions and 1663 deletions
--- a/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
+++ b/test/std/utilities/function.objects/unord.hash/enum.pass.cpp
@@ -12,9 +12,7 @@
 // make sure that we can hash enumeration values
 // Not very portable

-#include <__config>
-
-#if _LIBCPP_STD_VER > 11
+#if __cplusplus >= 201402L

 #include <functional>
 #include <cassert>