diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2012-10-14 15:04:43 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2012-10-14 15:04:43 -0700 |
| commit | 12c0e5d76395ae6348f5d411fef50aa777433f02 (patch) | |
| tree | dc276ea7741846868bb95b3bf158782a45e029a3 | |
| parent | 78a6d62732f2f0c2752d9de8729a745413ebe64a (diff) | |
| parent | 90aa5811d17205c4a87f91c0f9ad12c05a03ec44 (diff) | |
Merge pull request #340 from ChrisTX/insp20+clangwarningsfix
Resolve two warnings clang complains about
| -rw-r--r-- | include/consolecolors.h | 2 | ||||
| -rw-r--r-- | src/snomasks.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/consolecolors.h b/include/consolecolors.h index 953beb346..f7ca1335e 100644 --- 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 c35c19d4e..4953212a0 100644 --- 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)"; |