Fix warnings found from clang

smoofra · Oct 14, 2014 · 2b2c0d5 · 2b2c0d5
1 parent 0aac869
commit 2b2c0d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rct/Rct.cpp b/rct/Rct.cpp
@@ -412,7 +412,7 @@ const char *colors[] = {
 
 String colorize(const String &string, AnsiColor color, int from, int len)
 {
-    assert(from <= size());
+    assert(from <= string.size());
     assert(from >= 0);
     if (len == -1) {
         len = string.size() - from;

diff --git a/rct/String.h b/rct/String.h
@@ -768,12 +768,12 @@ class String
     std::string mString;
 };
 
-inline const bool operator==(const char *l, const String &r)
+inline bool operator==(const char *l, const String &r)
 {
     return r.operator==(l);
 }
 
-inline const bool operator!=(const char *l, const String &r)
+inline bool operator!=(const char *l, const String &r)
 {
     return r.operator!=(l);
 }