<div dir="ltr">Merged in r294103.</div><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Feb 4, 2017 at 1:39 PM, Eric Fiselier <span dir="ltr"><<a href="mailto:eric@efcs.ca" target="_blank">eric@efcs.ca</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">I'm going to merge this into v4.0 in order to fix <a href="https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216772" target="_blank">https://bugs.freebsd.org/<wbr>bugzilla/show_bug.cgi?id=<wbr>216772</a><span class="HOEnZb"><font color="#888888"><div><br></div><div>/Eric</div></font></span></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Sat, Feb 4, 2017 at 1:27 PM, Eric Fiselier via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: ericwf<br>
Date: Sat Feb  4 14:27:46 2017<br>
New Revision: 294099<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=294099&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=294099&view=rev</a><br>
Log:<br>
Undefine min/max in __tree<br>
<br>
Added:<br>
    libcxx/trunk/test/libcxx/conta<wbr>iners/associative/undef_min_<wbr>max.pass.cpp<br>
Modified:<br>
    libcxx/trunk/include/__tree<br>
<br>
Modified: libcxx/trunk/include/__tree<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/include/__tree?rev=294099&r1=294098&r2=294099&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/libcxx/trunk/include/__<wbr>tree?rev=294099&r1=294098&r2=2<wbr>94099&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- libcxx/trunk/include/__tree (original)<br>
+++ libcxx/trunk/include/__tree Sat Feb  4 14:27:46 2017<br>
@@ -17,6 +17,8 @@<br>
 #include <stdexcept><br>
 #include <algorithm><br>
<br>
+#include <__undef_min_max><br>
+<br>
 #if !defined(_LIBCPP_HAS_NO_PRAGMA<wbr>_SYSTEM_HEADER)<br>
 #pragma GCC system_header<br>
 #endif<br>
<br>
Added: libcxx/trunk/test/libcxx/conta<wbr>iners/associative/undef_min_<wbr>max.pass.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/containers/associative/undef_min_max.pass.cpp?rev=294099&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/libcxx/trunk/test/libcxx<wbr>/containers/associative/undef_<wbr>min_max.pass.cpp?rev=294099&<wbr>view=auto</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- libcxx/trunk/test/libcxx/conta<wbr>iners/associative/undef_min_<wbr>max.pass.cpp (added)<br>
+++ libcxx/trunk/test/libcxx/conta<wbr>iners/associative/undef_min_<wbr>max.pass.cpp Sat Feb  4 14:27:46 2017<br>
@@ -0,0 +1,22 @@<br>
+//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
+//<br>
+//                     The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is dual licensed under the MIT and the University of Illinois Open<br>
+// Source Licenses. See LICENSE.TXT for details.<br>
+//<br>
+//===------------------------<wbr>------------------------------<wbr>----------------===//<br>
+<br>
+#if defined(__GNUC__)<br>
+#pragma GCC diagnostic ignored "-W#warnings"<br>
+#endif<br>
+<br>
+#define min THIS IS A NASTY MACRO!<br>
+#define max THIS IS A NASTY MACRO!<br>
+<br>
+#include <map><br>
+<br>
+int main() {<br>
+  std::map<int, int> m;<br>
+  ((void)m);<br>
+}<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>