svn commit: r313295 - in vendor/libc++/dist: include test/libcxx/containers/associative

[Dimitry Andric]

Author: dim
Date: Sun Feb  5 19:37:54 2017
New Revision: 313295
URL: https://svnweb.freebsd.org/changeset/base/313295

Log:
  Vendor import of libc++ release_40 branch r294123:
  https://llvm.org/svn/llvm-project/libcxx/branches/release_40@294123

Added:
  vendor/libc++/dist/test/libcxx/containers/associative/undef_min_max.pass.cpp   (contents, props changed)
Modified:
  vendor/libc++/dist/include/__tree

Modified: vendor/libc++/dist/include/__tree
==============================================================================
--- vendor/libc++/dist/include/__tree	Sun Feb  5 19:37:51 2017	(r313294)
+++ vendor/libc++/dist/include/__tree	Sun Feb  5 19:37:54 2017	(r313295)
@@ -17,6 +17,8 @@
 #include <stdexcept>
 #include <algorithm>
 
+#include <__undef_min_max>
+
 #if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER)
 #pragma GCC system_header
 #endif

Added: vendor/libc++/dist/test/libcxx/containers/associative/undef_min_max.pass.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ vendor/libc++/dist/test/libcxx/containers/associative/undef_min_max.pass.cpp	Sun Feb  5 19:37:54 2017	(r313295)
@@ -0,0 +1,22 @@
+//===----------------------------------------------------------------------===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is dual licensed under the MIT and the University of Illinois Open
+// Source Licenses. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic ignored "-W#warnings"
+#endif
+
+#define min THIS IS A NASTY MACRO!
+#define max THIS IS A NASTY MACRO!
+
+#include <map>
+
+int main() {
+  std::map<int, int> m;
+  ((void)m);
+}