From 8580bde1315df67381c94135ffa496343a6b1a62 Mon Sep 17 00:00:00 2001 From: WrinklyNinja Date: Sat, 10 May 2014 16:41:08 +0100 Subject: [PATCH] Misc compiler warning fixes. --- src/api/api.cpp | 2 +- src/backend/game.cpp | 2 +- src/backend/metadata.cpp | 2 +- src/backend/parsers.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/api/api.cpp b/src/api/api.cpp index ea82a0e9..b0e0bf11 100644 --- a/src/api/api.cpp +++ b/src/api/api.cpp @@ -146,7 +146,7 @@ unsigned int c_error(const loot::error& e) { extMessageStr = new char[strlen(e.what()) + 1]; strcpy(extMessageStr, e.what()); } - catch (std::bad_alloc& e) { + catch (std::bad_alloc& /*e*/) { extMessageStr = NULL; } return e.code(); diff --git a/src/backend/game.cpp b/src/backend/game.cpp index fd2646f7..413cbec3 100644 --- a/src/backend/game.cpp +++ b/src/backend/game.cpp @@ -485,7 +485,7 @@ namespace loot { if (!loadorder.empty()) { - time_t lastTime, thisTime; + time_t lastTime; fs::path filepath = DataPath() / *loadorder.begin(); if (!fs::exists(filepath) && fs::exists(filepath.string() + ".ghost")) filepath += ".ghost"; diff --git a/src/backend/metadata.cpp b/src/backend/metadata.cpp index a5954413..4ffecd1e 100644 --- a/src/backend/metadata.cpp +++ b/src/backend/metadata.cpp @@ -46,7 +46,7 @@ namespace loot { FormID::FormID(const std::string& sourcePlugin, const uint32_t objectID) : plugin(sourcePlugin), id(objectID) {} FormID::FormID(const std::vector& sourcePlugins, const uint32_t formID) { - int index = formID >> 24; + unsigned int index = formID >> 24; id = formID & ~((uint32_t)index << 24); if (index >= sourcePlugins.size()) { diff --git a/src/backend/parsers.h b/src/backend/parsers.h index af81d801..d001e483 100644 --- a/src/backend/parsers.h +++ b/src/backend/parsers.h @@ -531,7 +531,7 @@ namespace loot { boost::regex regex; try { regex = boost::regex(filename, boost::regex::perl|boost::regex::icase); - } catch (boost::regex_error& e) { + } catch (boost::regex_error& /*e*/) { BOOST_LOG_TRIVIAL(error) << "Invalid regex string:" << filename; throw loot::error(loot::error::invalid_args, boost::locale::translate("Invalid regex string:").str() + " " + filename); }