[Libreoffice-commits] core.git: external/boost

[Tor Lillqvist]

 external/boost/boost.jsonparser.warnings.patch.0 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cf704d65e005b08697c7a6f454acff01bd4ef6c3
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Apr 2 18:16:57 2014 +0300

    WaE: comparison of constant 255 with expression of type 'const char'
    
    Better fix for warning: "comparison of constant 255 with expression of
    type 'const char' is always true". I hadn't considered that the code
    is in a template, so it must handle strings of arbitrary integer types
    (well, Unicode).
    
    Change-Id: I38d6d480bfc3ff89db1276cac38d310ecdcc2cfa

diff --git a/external/boost/boost.jsonparser.warnings.patch.0 b/external/boost/boost.jsonparser.warnings.patch.0
index b3d9bbf..0cda6ea 100644
--- a/external/boost/boost.jsonparser.warnings.patch.0
+++ b/external/boost/boost.jsonparser.warnings.patch.0
@@ -63,7 +63,7 @@
              // handle high unicode characters.
              if (*b == 0x20 || *b == 0x21 || (*b >= 0x23 && *b <= 0x2E) ||
 -                (*b >= 0x30 && *b <= 0x5B) || (*b >= 0x5D && *b <= 0xFF))
-+                (*b >= 0x30 && *b <= 0x5B) || (*b >= 0x5D))
++                (*b >= 0x30 && *b <= 0x5B) || (*b >= 0x5D && static_cast<typename std::basic_string<Ch>::traits_type::int_type>(*b) <= 0xFF))
                  result += *b;
              else if (*b == Ch('\b')) result += Ch('\\'), result += Ch('b');
              else if (*b == Ch('\f')) result += Ch('\\'), result += Ch('f');