commit 7ff972511a6dd62f9a2623d86595575fb400b879
Author: Andy Lutomirski <luto@kernel.org>
Date:   Thu Feb 4 11:52:42 2016 -0800

    fish_tests: Explicitly cast -2 to wchar_t
    
    On arm, wchar_t is unsigned, and C++11 and newer disallow implicit
    narrowing conversions inside braces.  Use an explicit conversion to
    fix the build on GCC 6 and up, which defaults to C++11.

diff --git a/src/fish_tests.cpp b/src/fish_tests.cpp
index 90d9dadc30e6..521825516ce3 100644
--- a/src/fish_tests.cpp
+++ b/src/fish_tests.cpp
@@ -1154,7 +1154,7 @@ static void test_utf8()
     wchar_t w4[] = {0x15555, 0xf7777, 0xa};
     wchar_t w5[] = {0x255555, 0x1fa04ff, 0xddfd04, 0xa};
     wchar_t w6[] = {0xf255555, 0x1dfa04ff, 0x7fddfd04, 0xa};
-    wchar_t wb[] = {-2, 0xa, (wchar_t)0xffffffff, 0x0441};
+    wchar_t wb[] = {(wchar_t)-2, 0xa, (wchar_t)0xffffffff, 0x0441};
     wchar_t wm[] = {0x41, 0x0441, 0x3042, 0xff67, 0x9b0d, 0x2e05da67};
     wchar_t wb1[] = {0xa, 0x0422};
     wchar_t wb2[] = {0xd800, 0xda00, 0x41, 0xdfff, 0xa};