diff options
author | lns <matzeton@googlemail.com> | 2018-06-25 15:28:22 +0200 |
---|---|---|
committer | lns <matzeton@googlemail.com> | 2018-06-25 15:28:22 +0200 |
commit | a2714df784e3af445d7cb6ac966a375bd9c82394 (patch) | |
tree | db61d15d79abd4c9082bf84f7b64008c4c23be98 /src | |
parent | 8df308b6b69ce5eae98dee733ee56db6fbd3adb3 (diff) |
configure.ac: dont error if wxwidgets not build and --disable-gui set; mock.py:
set interpreter to python2.7 (no python3 support); src/*: fix compiler warnings
Signed-off-by: lns <matzeton@googlemail.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/Csv.hpp | 6 | ||||
-rw-r--r-- | src/UpdateFactory.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/Csv.hpp b/src/Csv.hpp index 09cd053..400f35b 100644 --- a/src/Csv.hpp +++ b/src/Csv.hpp @@ -73,8 +73,8 @@ namespace io{ std::memset(file_name, 0, max_file_name_length+1); } - void set_file_name(const char*file_name){ - std::strncpy(this->file_name, file_name, max_file_name_length); + void set_file_name(const char *file_name){ + std::strncpy(this->file_name, file_name, max_file_name_length+1); this->file_name[max_file_name_length] = '\0'; } @@ -1096,7 +1096,7 @@ namespace io{ private: LineReader in; - char*(row[column_count]); + char* row[column_count]; std::string column_names[column_count]; std::vector<int>col_order; diff --git a/src/UpdateFactory.cpp b/src/UpdateFactory.cpp index 909f8ea..6a25da8 100644 --- a/src/UpdateFactory.cpp +++ b/src/UpdateFactory.cpp @@ -95,7 +95,7 @@ void mapEmcError(int error, std::string& out) { try { out = error_map.at(error); - } catch (std::out_of_range) { + } catch (const std::out_of_range &e) { out = "Unknown"; } } |