diff options
author | ipknHama <ipknhama@gmail.com> | 2016-08-27 18:03:49 +0900 |
---|---|---|
committer | ipknHama <ipknhama@gmail.com> | 2016-08-27 18:03:49 +0900 |
commit | e161da45e08a2eaaec747a784020d69f8223418d (patch) | |
tree | 0e5c326565e4ddc8fd26d05715666faaf757315f /include | |
parent | abc36e1b3ab2edf30ea07ea2a82a395ce312f6f6 (diff) | |
download | crow-e161da45e08a2eaaec747a784020d69f8223418d.tar.gz crow-e161da45e08a2eaaec747a784020d69f8223418d.zip |
Remove warnings: manually applying #101, #104
Diffstat (limited to 'include')
-rw-r--r-- | include/common.h | 4 | ||||
-rw-r--r-- | include/crow.h | 6 | ||||
-rw-r--r-- | include/http_connection.h | 16 | ||||
-rw-r--r-- | include/http_server.h | 2 | ||||
-rw-r--r-- | include/json.h | 20 | ||||
-rw-r--r-- | include/logging.h | 2 | ||||
-rw-r--r-- | include/middleware.h | 2 | ||||
-rw-r--r-- | include/utility.h | 4 |
8 files changed, 27 insertions, 29 deletions
diff --git a/include/common.h b/include/common.h index fe6db93..8203378 100644 --- a/include/common.h +++ b/include/common.h @@ -121,7 +121,7 @@ namespace crow } #ifndef CROW_MSVC_WORKAROUND -constexpr crow::HTTPMethod operator "" _method(const char* str, size_t len) +constexpr crow::HTTPMethod operator "" _method(const char* str, size_t /*len*/) { return crow::black_magic::is_equ_p(str, "GET", 3) ? crow::HTTPMethod::Get : @@ -133,5 +133,5 @@ constexpr crow::HTTPMethod operator "" _method(const char* str, size_t len) crow::black_magic::is_equ_p(str, "CONNECT", 7) ? crow::HTTPMethod::Connect : crow::black_magic::is_equ_p(str, "TRACE", 5) ? crow::HTTPMethod::Trace : throw std::runtime_error("invalid http method"); -}; +} #endif diff --git a/include/crow.h b/include/crow.h index aff6716..5d99b91 100644 --- a/include/crow.h +++ b/include/crow.h @@ -166,7 +166,7 @@ namespace crow #else template <typename T, typename ... Remain> - self_t& ssl_file(T&& t, Remain&&...) + self_t& ssl_file(T&&, Remain&&...) { // We can't call .ssl() member function unless CROW_ENABLE_SSL is defined. static_assert( @@ -177,7 +177,7 @@ namespace crow } template <typename T> - self_t& ssl(T&& ctx) + self_t& ssl(T&&) { // We can't call .ssl() member function unless CROW_ENABLE_SSL is defined. static_assert( @@ -220,4 +220,4 @@ namespace crow template <typename ... Middlewares> using App = Crow<Middlewares...>; using SimpleApp = Crow<>; -}; +} diff --git a/include/http_connection.h b/include/http_connection.h index 69b87b0..2bc6906 100644 --- a/include/http_connection.h +++ b/include/http_connection.h @@ -98,28 +98,28 @@ namespace crow template <typename MW, typename Context, typename ParentContext> typename std::enable_if<!is_before_handle_arity_3_impl<MW>::value>::type - before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& parent_ctx) + before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/) { mw.before_handle(req, res, ctx.template get<MW>(), ctx); } template <typename MW, typename Context, typename ParentContext> typename std::enable_if<is_before_handle_arity_3_impl<MW>::value>::type - before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& parent_ctx) + before_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/) { mw.before_handle(req, res, ctx.template get<MW>()); } template <typename MW, typename Context, typename ParentContext> typename std::enable_if<!is_after_handle_arity_3_impl<MW>::value>::type - after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& parent_ctx) + after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/) { mw.after_handle(req, res, ctx.template get<MW>(), ctx); } template <typename MW, typename Context, typename ParentContext> typename std::enable_if<is_after_handle_arity_3_impl<MW>::value>::type - after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& parent_ctx) + after_handler_call(MW& mw, request& req, response& res, Context& ctx, ParentContext& /*parent_ctx*/) { mw.after_handle(req, res, ctx.template get<MW>()); } @@ -146,14 +146,14 @@ namespace crow } template <int N, typename Context, typename Container> - bool middleware_call_helper(Container& middlewares, request& req, response& res, Context& ctx) + bool middleware_call_helper(Container& /*middlewares*/, request& /*req*/, response& /*res*/, Context& /*ctx*/) { return false; } template <int N, typename Context, typename Container> typename std::enable_if<(N<0)>::type - after_handlers_call_helper(Container& middlewares, Context& context, request& req, response& res) + after_handlers_call_helper(Container& /*middlewares*/, Context& /*context*/, request& /*req*/, response& /*res*/) { } @@ -484,7 +484,7 @@ namespace crow //auto self = this->shared_from_this(); is_writing = true; boost::asio::async_write(adaptor_.socket(), buffers_, - [&](const boost::system::error_code& ec, std::size_t bytes_transferred) + [&](const boost::system::error_code& ec, std::size_t /*bytes_transferred*/) { is_writing = false; res.clear(); @@ -522,7 +522,7 @@ namespace crow timer_queue.cancel(timer_cancel_key_); } - void start_deadline(int timeout = 5) + void start_deadline(/*int timeout = 5*/) { cancel_deadline_timer(); diff --git a/include/http_server.h b/include/http_server.h index fbe470d..94f2fc3 100644 --- a/include/http_server.h +++ b/include/http_server.h @@ -104,7 +104,7 @@ namespace crow CROW_LOG_INFO << server_name_ << " server is running, local port " << port_; signals_.async_wait( - [&](const boost::system::error_code& error, int signal_number){ + [&](const boost::system::error_code& /*error*/, int /*signal_number*/){ stop(); }); diff --git a/include/json.h b/include/json.h index c2ce20e..3706034 100644 --- a/include/json.h +++ b/include/json.h @@ -92,7 +92,7 @@ namespace crow case type::Object: return "Object"; default: return "Unknown"; } - }; + } class rvalue; rvalue load(const char* data, size_t size); @@ -164,7 +164,7 @@ namespace crow return os; } private: - void force(char* s, uint32_t length) + void force(char* s, uint32_t /*length*/) { s_ = s; owned_ = 1; @@ -671,7 +671,7 @@ namespace crow //static const char* escaped = "\"\\/\b\f\n\r\t"; struct Parser { - Parser(char* data, size_t size) + Parser(char* data, size_t /*size*/) : data(data) { } @@ -1093,17 +1093,16 @@ namespace crow s = r.s(); return; case type::List: - l = std::move(std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{})); + l = std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{}); l->reserve(r.size()); for(auto it = r.begin(); it != r.end(); ++it) l->emplace_back(*it); return; case type::Object: - o = std::move( - std::unique_ptr< + o = std::unique_ptr< std::unordered_map<std::string, wvalue> >( - new std::unordered_map<std::string, wvalue>{})); + new std::unordered_map<std::string, wvalue>{}); for(auto it = r.begin(); it != r.end(); ++it) o->emplace(it->key(), *it); return; @@ -1249,7 +1248,7 @@ namespace crow reset(); t_ = type::List; if (!l) - l = std::move(std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{})); + l = std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{}); l->clear(); l->resize(v.size()); size_t idx = 0; @@ -1266,7 +1265,7 @@ namespace crow reset(); t_ = type::List; if (!l) - l = std::move(std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{})); + l = std::unique_ptr<std::vector<wvalue>>(new std::vector<wvalue>{}); if (l->size() < index+1) l->resize(index+1); return (*l)[index]; @@ -1287,8 +1286,7 @@ namespace crow reset(); t_ = type::Object; if (!o) - o = std::move( - std::unique_ptr< + o = std::unique_ptr< std::unordered_map<std::string, wvalue> >( new std::unordered_map<std::string, wvalue>{})); diff --git a/include/logging.h b/include/logging.h index 41ac0ab..13cdad2 100644 --- a/include/logging.h +++ b/include/logging.h @@ -35,7 +35,7 @@ namespace crow class CerrLogHandler : public ILogHandler { public: - void log(std::string message, LogLevel level) override { + void log(std::string message, LogLevel /*level*/) override { std::cerr << message; } }; diff --git a/include/middleware.h b/include/middleware.h index ec54476..534a87a 100644 --- a/include/middleware.h +++ b/include/middleware.h @@ -139,7 +139,7 @@ namespace crow } } - void after_handle(request& req, response& res, context& ctx) + void after_handle(request& /*req*/, response& res, context& ctx) { for(auto& cookie:ctx.cookies_to_add) { diff --git a/include/utility.h b/include/utility.h index cf12158..183d65b 100644 --- a/include/utility.h +++ b/include/utility.h @@ -14,7 +14,7 @@ namespace crow #ifndef CROW_MSVC_WORKAROUND struct OutOfRange { - OutOfRange(unsigned pos, unsigned length) {} + OutOfRange(unsigned /*pos*/, unsigned /*length*/) {} }; constexpr unsigned requires_in_range( unsigned i, unsigned len ) { @@ -129,7 +129,7 @@ template <> \ struct parameter_tag<t> \ { \ static const int value = i; \ -}; +} CROW_INTERNAL_PARAMETER_TAG(int, 1); CROW_INTERNAL_PARAMETER_TAG(char, 1); CROW_INTERNAL_PARAMETER_TAG(short, 1); |