From b8ad3acb79e26a31124d3d4dcb2499d0092861a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonathan=20M=C3=BCller?= <git@foonathan.net>
Date: Mon, 24 Apr 2017 09:58:21 +0200
Subject: [PATCH] Fix -Wconversion errors

---
 src/libclang/tokenizer.cpp | 8 ++++++--
 tool/main.cpp              | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/libclang/tokenizer.cpp b/src/libclang/tokenizer.cpp
index c127769..d972272 100644
--- a/src/libclang/tokenizer.cpp
+++ b/src/libclang/tokenizer.cpp
@@ -30,7 +30,11 @@ namespace
     {
         unsigned offset;
         clang_getSpellingLocation(loc, nullptr, nullptr, nullptr, &offset);
-        return clang_getLocationForOffset(tu, file, offset + inc);
+        if (inc >= 0)
+            offset += unsigned(inc);
+        else
+            offset -= unsigned(-inc);
+        return clang_getLocationForOffset(tu, file, offset);
     }
 
     class simple_tokenizer
@@ -312,7 +316,7 @@ detail::token_iterator detail::find_closing_bracket(detail::token_stream stream)
             --bracket_count;
         else if (paren_count == 0 && template_bracket && cur == ">>")
             // maximal munch
-            bracket_count -= 2u;
+            bracket_count -= 2;
         else if (cur == "(" || cur == "{" || cur == "[")
             ++paren_count;
         else if (cur == ")" || cur == "}" || cur == "]")
diff --git a/tool/main.cpp b/tool/main.cpp
index afcbab3..c33d8a7 100644
--- a/tool/main.cpp
+++ b/tool/main.cpp
@@ -288,7 +288,7 @@ int main(int argc, char* argv[])
             logger.set_verbose(true);
 
         auto file = parse_file(config, logger, options["file"].as<std::string>(),
-                               options.count("fatal_errors") == 1u);
+                               options.count("fatal_errors") == 1);
         if (!file)
             return 2;
         print_ast(std::cout, *file);