MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some warnings

develop
Ben Lubar 2020-02-10 19:35:17 -06:00
parent 7b9ea1f1b6
commit 3c9f6f79ab
No known key found for this signature in database
GPG Key ID: 92939677AB59EDA4
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
depends/protobuf/CMakeLists.txt
Unescape Escape View File

@ -146,7 +146,7 @@ list(APPEND LIBPROTOBUF_FULL_SRCS ${LIBPROTOBUF_LITE_SRCS})
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-sign-compare") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -Wno-sign-compare")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result -Wno-unused-local-typedefs -Wno-misleading-indentation") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unused-result -Wno-unused-local-typedefs -Wno-misleading-indentation -Wno-class-memaccess")
elseif(MSVC) elseif(MSVC)
# Disable warnings for integer conversion to smaller type # Disable warnings for integer conversion to smaller type
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4267")

4
library/RemoteServer.cpp
Unescape Escape View File

@ -240,7 +240,7 @@ void ServerConnection::Accepted(CActiveSocket* socket)
std::thread{[](CActiveSocket* socket) { std::thread{[](CActiveSocket* socket) {
try { try {
ServerConnection(socket).threadFn(); ServerConnection(socket).threadFn();
} catch (BlockedException e) { } catch (BlockedException &) {
} }
}, socket}.detach(); }, socket}.detach();
} }
@ -478,7 +478,7 @@ void ServerMainImpl::threadFn(std::promise<bool> promise, int port)
ServerConnection::Accepted(client); ServerConnection::Accepted(client);
client = nullptr; client = nullptr;
} }
} catch(BlockedException e) { } catch(BlockedException &) {
if (client) if (client)
client->Close(); client->Close();
delete client; delete client;

4
plugins/debug.cpp
Unescape Escape View File

@ -537,7 +537,7 @@ command_result FilterManager::saveConfig(DFHack::color_ostream& out) const noexc
if (!ofs.good()) if (!ofs.good())
throw std::runtime_error{"Failed to open configuration file for writing"}; throw std::runtime_error{"Failed to open configuration file for writing"};
ofs << archive; ofs << archive;
} catch(std::exception e) { } catch(std::exception & e) {
ERR(command, out) << "Serializing filters to '" << configPath << "' failed: " ERR(command, out) << "Serializing filters to '" << configPath << "' failed: "
<< e.what() << std::endl; << e.what() << std::endl;
return CR_FAILURE; return CR_FAILURE;
@ -584,7 +584,7 @@ static command_result parseRegexParam(std::regex& target,
try { try {
std::regex temp{parameters[pos], defaultRegex}; std::regex temp{parameters[pos], defaultRegex};
target = std::move(temp); target = std::move(temp);
} catch(std::regex_error e) { } catch(std::regex_error & e) {
ERR(command,out) << "Failed to parse regular expression '" ERR(command,out) << "Failed to parse regular expression '"
<< parameters[pos] << "'\n"; << parameters[pos] << "'\n";
ERR(command,out) << "Parser message: " << e.what() << std::endl; ERR(command,out) << "Parser message: " << e.what() << std::endl;