[llvm] r231894 - Fix a grammar issue I introduced.

[David Blaikie]

On Wed, Mar 11, 2015 at 7:11 AM, Benjamin Kramer <benny.kra at gmail.com>
wrote:

>
> > On 11.03.2015, at 01:19, Chandler Carruth <chandlerc at gmail.com> wrote:
> >
> > Author: chandlerc
> > Date: Tue Mar 10 19:19:01 2015
> > New Revision: 231894
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=231894&view=rev
> > Log:
> > Fix a grammar issue I introduced.
>
> Can you upstream the gtest changes? Merge conflicts because of this would
> be very unfortunate.
>

& 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 (r231095)


>
> - Ben
> >
> > Modified:
> >
> llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h
> >
> > Modified:
> llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h
> > URL:
> 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
> >
> ==============================================================================
> > ---
> llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h
> (original)
> > +++
> llvm/trunk/utils/unittest/googletest/include/gtest/internal/gtest-port.h
> Tue Mar 10 19:19:01 2015
> > @@ -503,7 +503,7 @@
> > #   define _TR1_FUNCTIONAL 1
> > #   include <tr1/tuple>
> > #   undef _TR1_FUNCTIONAL  // Allows the user to #include
> > -                        // <tr1/functional> if they chooses to.
> > +                        // <tr1/functional> if they choose to.
> > #  else
> > #   include <tr1/tuple>  // NOLINT
> > #  endif  // !GTEST_HAS_RTTI && GTEST_GCC_VER_ < 40302
> >
> >
> > _______________________________________________
> > llvm-commits mailing list
> > llvm-commits at cs.uiuc.edu
> > http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20150311/91a77be0/attachment.html>