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

Benjamin Kramer benny.kra at gmail.com
Wed Mar 11 07:11:59 PDT 2015


> 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.

- 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





More information about the llvm-commits mailing list