<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Wed, Mar 11, 2015 at 7:11 AM, Benjamin Kramer <span dir="ltr"><<a href="mailto:benny.kra@gmail.com" target="_blank">benny.kra@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex"><span><br>
> On 11.03.2015, at 01:19, Chandler Carruth <<a href="mailto:chandlerc@gmail.com" target="_blank">chandlerc@gmail.com</a>> wrote:<br>
><br>
> Author: chandlerc<br>
> Date: Tue Mar 10 19:19:01 2015<br>
> New Revision: 231894<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=231894&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=231894&view=rev</a><br>
> Log:<br>
> Fix a grammar issue I introduced.<br>
<br>
</span>Can you upstream the gtest changes? Merge conflicts because of this would be very unfortunate.<br></blockquote><div><br>& if you're upstreaming gtest fixes, there's one I made in the last couple of weeks to fix a -Wdeprecated warning under C++11 that could go along with these (r<span style="font-family:monospace">231095)</span><br> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-color:rgb(204,204,204);border-left-style:solid;padding-left:1ex">
<br>
- Ben<br>
<div><div>><br>
> Modified:<br>
>    llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h<br>
><br>
> Modified: llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h?rev=231894&r1=231893&r2=231894&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h?rev=231894&r1=231893&r2=231894&view=diff</a><br>
> ==============================================================================<br>
> --- llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h (original)<br>
> +++ llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h Tue Mar 10 19:19:01 2015<br>
> @@ -503,7 +503,7 @@<br>
> #   define _TR1_FUNCTIONAL 1<br>
> #   include <tr1/tuple><br>
> #   undef _TR1_FUNCTIONAL  // Allows the user to #include<br>
> -                        // <tr1/functional> if they chooses to.<br>
> +                        // <tr1/functional> if they choose to.<br>
> #  else<br>
> #   include <tr1/tuple>  // NOLINT<br>
> #  endif  // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302<br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu" target="_blank">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</div></div></blockquote></div><br></div></div>