Merge pull request #340 from ChrisTX/insp20+clangwarningsfix

Resolve two warnings clang complains about

diff --git a/include/consolecolors.h b/include/consolecolors.h
index 953beb34658c5ea3cf09dc76507ec7bed639ab33..f7ca1335ed244f16514d457d4fa035971fab2996 100644 (file)
--- a/include/consolecolors.h
+++ b/include/consolecolors.h
@@ -97,4 +97,4 @@ inline std::ostream& con_reset(std::ostream &s)
 
 #endif
 
-#endif
\ No newline at end of file
+#endif

diff --git a/src/snomasks.cpp b/src/snomasks.cpp
index c35c19d4eb680013ccf737259c247acc1ded0b4c..4953212a047968fafec0c486115470b1c6b0fc6a 100644 (file)
--- a/src/snomasks.cpp
+++ b/src/snomasks.cpp
@@ -100,7 +100,7 @@ void Snomask::SendMessage(const std::string &message, char mysnomask)
 
                std::string desc = Description;
                if (desc.empty())
-                       desc = "SNO-" + tolower(mysnomask);
+                       desc = std::string("SNO-") + (char)tolower(mysnomask);
                if (isupper(mysnomask))
                        desc = "REMOTE" + desc;
                ModResult MOD_RESULT;
@@ -136,7 +136,7 @@ void Snomask::Flush()
        {
                std::string desc = Description;
                if (desc.empty())
-                       desc = "SNO-" + tolower(LastLetter);
+                       desc = std::string("SNO-") + (char)tolower(LastLetter);
                if (isupper(LastLetter))
                        desc = "REMOTE" + desc;
                std::string mesg = "(last message repeated "+ConvToStr(Count)+" times)";