Browse Source

Do not shadow member variables

0.14
Pavel Janík 8 years ago
parent
commit
ff8d279a78
  1. 2
      src/httprpc.cpp
  2. 18
      src/httpserver.cpp

2
src/httprpc.cpp

@ -45,7 +45,7 @@ private:
class HTTPRPCTimerInterface : public RPCTimerInterface class HTTPRPCTimerInterface : public RPCTimerInterface
{ {
public: public:
HTTPRPCTimerInterface(struct event_base* base) : base(base) HTTPRPCTimerInterface(struct event_base* _base) : base(_base)
{ {
} }
const char* Name() const char* Name()

18
src/httpserver.cpp

@ -42,8 +42,8 @@ static const size_t MAX_HEADERS_SIZE = 8192;
class HTTPWorkItem : public HTTPClosure class HTTPWorkItem : public HTTPClosure
{ {
public: public:
HTTPWorkItem(std::unique_ptr<HTTPRequest> req, const std::string &path, const HTTPRequestHandler& func): HTTPWorkItem(std::unique_ptr<HTTPRequest> _req, const std::string &_path, const HTTPRequestHandler& _func):
req(std::move(req)), path(path), func(func) req(std::move(_req)), path(_path), func(_func)
{ {
} }
void operator()() void operator()()
@ -92,8 +92,8 @@ private:
}; };
public: public:
WorkQueue(size_t maxDepth) : running(true), WorkQueue(size_t _maxDepth) : running(true),
maxDepth(maxDepth), maxDepth(_maxDepth),
numThreads(0) numThreads(0)
{ {
} }
@ -158,8 +158,8 @@ public:
struct HTTPPathHandler struct HTTPPathHandler
{ {
HTTPPathHandler() {} HTTPPathHandler() {}
HTTPPathHandler(std::string prefix, bool exactMatch, HTTPRequestHandler handler): HTTPPathHandler(std::string _prefix, bool _exactMatch, HTTPRequestHandler _handler):
prefix(prefix), exactMatch(exactMatch), handler(handler) prefix(_prefix), exactMatch(_exactMatch), handler(_handler)
{ {
} }
std::string prefix; std::string prefix;
@ -517,8 +517,8 @@ static void httpevent_callback_fn(evutil_socket_t, short, void* data)
delete self; delete self;
} }
HTTPEvent::HTTPEvent(struct event_base* base, bool deleteWhenTriggered, const std::function<void(void)>& handler): HTTPEvent::HTTPEvent(struct event_base* base, bool _deleteWhenTriggered, const std::function<void(void)>& _handler):
deleteWhenTriggered(deleteWhenTriggered), handler(handler) deleteWhenTriggered(_deleteWhenTriggered), handler(_handler)
{ {
ev = event_new(base, -1, 0, httpevent_callback_fn, this); ev = event_new(base, -1, 0, httpevent_callback_fn, this);
assert(ev); assert(ev);
@ -534,7 +534,7 @@ void HTTPEvent::trigger(struct timeval* tv)
else else
evtimer_add(ev, tv); // trigger after timeval passed evtimer_add(ev, tv); // trigger after timeval passed
} }
HTTPRequest::HTTPRequest(struct evhttp_request* req) : req(req), HTTPRequest::HTTPRequest(struct evhttp_request* _req) : req(_req),
replySent(false) replySent(false)
{ {
} }

Loading…
Cancel
Save