diff options
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/encoding.hpp | 2 | ||||
| -rw-r--r-- | src/utils/time.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/utils/encoding.hpp b/src/utils/encoding.hpp index 586edd8..b707a0c 100644 --- a/src/utils/encoding.hpp +++ b/src/utils/encoding.hpp @@ -28,7 +28,7 @@ namespace utils * Convert the given string (encoded is "encoding") into valid utf-8. * If some decoding fails, insert an utf-8 placeholder character instead. */ - std::string convert_to_utf8(const std::string& str, const char* encoding); + std::string convert_to_utf8(const std::string& str, const char* charset); } namespace xep0106 diff --git a/src/utils/time.cpp b/src/utils/time.cpp index 8fa3fcd..88b3de3 100644 --- a/src/utils/time.cpp +++ b/src/utils/time.cpp @@ -1,5 +1,5 @@ #include <utils/time.hpp> -#include <time.h> +#include <ctime> #include <sstream> #include <iomanip> |