From 9460c0c3446e01cb3014a8501be2beee33f76f34 Mon Sep 17 00:00:00 2001 From: Raoul Hecky Date: Sun, 15 Jan 2017 14:31:29 +0100 Subject: [PATCH] Fix GCC warnings -Wshadow MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Renamed shadowed members errors like: warning: declaration of ‘path’ shadows a member of ‘uvw::FsEvent<(uvw::details::UVFsType)10>’ [-Wshadow] --- src/uvw/dns.hpp | 14 +++++++------- src/uvw/emitter.hpp | 4 ++-- src/uvw/fs.hpp | 46 ++++++++++++++++++++++---------------------- src/uvw/fs_event.hpp | 4 ++-- src/uvw/fs_poll.hpp | 4 ++-- src/uvw/poll.hpp | 4 ++-- src/uvw/stream.hpp | 42 ++++++++++++++++++++-------------------- src/uvw/tcp.hpp | 20 +++++++++---------- src/uvw/udp.hpp | 38 ++++++++++++++++++------------------ src/uvw/util.hpp | 2 +- 10 files changed, 89 insertions(+), 89 deletions(-) diff --git a/src/uvw/dns.hpp b/src/uvw/dns.hpp index 0ccc5fae..52eb8571 100644 --- a/src/uvw/dns.hpp +++ b/src/uvw/dns.hpp @@ -22,8 +22,8 @@ namespace uvw { struct AddrInfoEvent: Event { using Deleter = void(*)(addrinfo *); - AddrInfoEvent(std::unique_ptr data) - : data{std::move(data)} + AddrInfoEvent(std::unique_ptr _data) + : data{std::move(_data)} {} /** @@ -42,8 +42,8 @@ struct AddrInfoEvent: Event { * It will be emitted by GetNameInfoReq according with its functionalities. */ struct NameInfoEvent: Event { - NameInfoEvent(const char *hostname, const char *service) - : hostname{hostname}, service{service} + NameInfoEvent(const char *_hostname, const char *_service) + : hostname{_hostname}, service{_service} {} /** @@ -80,7 +80,7 @@ class GetAddrInfoReq final: public Request { ptr->publish(ErrorEvent{status}); } else { auto data = std::unique_ptr{ - res, [](addrinfo *res){ uv_freeaddrinfo(res); }}; + res, [](addrinfo *_res){ uv_freeaddrinfo(_res); }}; ptr->publish(AddrInfoEvent{std::move(data)}); } @@ -93,8 +93,8 @@ class GetAddrInfoReq final: public Request { auto getNodeAddrInfoSync(const char *node, const char *service, addrinfo *hints = nullptr) { auto req = get(); auto err = uv_getaddrinfo(parent(), req, nullptr, node, service, hints); - auto ptr = std::unique_ptr{req->addrinfo, [](addrinfo *res){ uv_freeaddrinfo(res); }}; - return std::make_pair(!err, std::move(ptr)); + auto _ptr = std::unique_ptr{req->addrinfo, [](addrinfo *_res){ uv_freeaddrinfo(_res); }}; + return std::make_pair(!err, std::move(_ptr)); } public: diff --git a/src/uvw/emitter.hpp b/src/uvw/emitter.hpp index 9b42b3f4..d922da2b 100644 --- a/src/uvw/emitter.hpp +++ b/src/uvw/emitter.hpp @@ -212,7 +212,7 @@ public: */ void clear() noexcept { std::for_each(handlers.begin(), handlers.end(), - [](auto &&handler){ if(handler) { handler->clear(); } }); + [](auto &&_handler){ if(_handler) { _handler->clear(); } }); } /** @@ -236,7 +236,7 @@ public: */ bool empty() const noexcept { return std::all_of(handlers.cbegin(), handlers.cend(), - [](auto &&handler){ return !handler || handler->empty(); }); + [](auto &&_handler){ return !_handler || _handler->empty(); }); } private: diff --git a/src/uvw/fs.hpp b/src/uvw/fs.hpp index 7e924e72..b2350c0a 100644 --- a/src/uvw/fs.hpp +++ b/src/uvw/fs.hpp @@ -112,7 +112,7 @@ enum class UVDirentTypeT: std::underlying_type_t { */ template struct FsEvent: Event> { - FsEvent(const char *path) noexcept: path{path} {} + FsEvent(const char *_path) noexcept: path{_path} {} const char * path; /*!< The path affecting the request. */ }; @@ -128,8 +128,8 @@ template<> struct FsEvent : Event> { - FsEvent(const char *path, std::unique_ptr data, std::size_t size) noexcept - : path{path}, data{std::move(data)}, size{size} + FsEvent(const char *_path, std::unique_ptr _data, std::size_t _size) noexcept + : path{_path}, data{std::move(_data)}, size{_size} {} const char * path; /*!< The path affecting the request. */ @@ -148,8 +148,8 @@ template<> struct FsEvent : Event> { - FsEvent(const char *path, std::size_t size) noexcept - : path{path}, size{size} + FsEvent(const char *_path, std::size_t _size) noexcept + : path{_path}, size{_size} {} const char * path; /*!< The path affecting the request. */ @@ -167,8 +167,8 @@ template<> struct FsEvent : Event> { - FsEvent(const char *path, std::size_t size) noexcept - : path{path}, size{size} + FsEvent(const char *_path, std::size_t _size) noexcept + : path{_path}, size{_size} {} const char * path; /*!< The path affecting the request. */ @@ -186,8 +186,8 @@ template<> struct FsEvent : Event> { - FsEvent(const char *path, Stat stat) noexcept - : path{path}, stat{std::move(stat)} + FsEvent(const char *_path, Stat _stat) noexcept + : path{_path}, stat{std::move(_stat)} {} const char * path; /*!< The path affecting the request. */ @@ -205,8 +205,8 @@ template<> struct FsEvent : Event> { - FsEvent(const char *path, Stat stat) noexcept - : path{path}, stat{std::move(stat)} + FsEvent(const char *_path, Stat _stat) noexcept + : path{_path}, stat{std::move(_stat)} {} const char * path; /*!< The path affecting the request. */ @@ -224,8 +224,8 @@ template<> struct FsEvent : Event> { - FsEvent(const char *path, Stat stat) noexcept - : path{path}, stat{std::move(stat)} + FsEvent(const char *_path, Stat _stat) noexcept + : path{_path}, stat{std::move(_stat)} {} const char * path; /*!< The path affecting the request. */ @@ -243,8 +243,8 @@ template<> struct FsEvent : Event> { - FsEvent(const char *path, std::size_t size) noexcept - : path{path}, size{size} + FsEvent(const char *_path, std::size_t _size) noexcept + : path{_path}, size{_size} {} const char * path; /*!< The path affecting the request. */ @@ -262,8 +262,8 @@ template<> struct FsEvent : Event> { - explicit FsEvent(const char *path, const char *data, std::size_t size) noexcept - : path{path}, data{data}, size{size} + explicit FsEvent(const char *_path, const char *_data, std::size_t _size) noexcept + : path{_path}, data{_data}, size{_size} {} const char * path; /*!< The path affecting the request. */ @@ -474,8 +474,8 @@ public: * @param len The lenght of the submitted data. * @param offset Offset, as described in the official documentation. */ - void write(std::unique_ptr data, std::size_t len, int64_t offset) { - this->data = std::move(data); + void write(std::unique_ptr _data, std::size_t len, int64_t offset) { + this->data = std::move(_data); uv_buf_t bufs[] = { uv_buf_init(this->data.get(), len) }; cleanupAndInvoke(&uv_fs_write, parent(), get(), file, bufs, 1, offset, &fsResultCallback); } @@ -493,8 +493,8 @@ public: * @param len The lenght of the submitted data. * @param offset Offset, as described in the official documentation. */ - void write(char *data, std::size_t len, int64_t offset) { - uv_buf_t bufs[] = { uv_buf_init(data, len) }; + void write(char *_data, std::size_t len, int64_t offset) { + uv_buf_t bufs[] = { uv_buf_init(_data, len) }; cleanupAndInvoke(&uv_fs_write, parent(), get(), file, bufs, 1, offset, &fsResultCallback); } @@ -509,8 +509,8 @@ public: * * A boolean value that is true in case of success, false otherwise. * * The amount of data written to the given path. */ - std::pair writeSync(std::unique_ptr data, std::size_t len, int64_t offset) { - this->data = std::move(data); + std::pair writeSync(std::unique_ptr _data, std::size_t len, int64_t offset) { + this->data = std::move(_data); uv_buf_t bufs[] = { uv_buf_init(this->data.get(), len) }; auto req = get(); cleanupAndInvokeSync(&uv_fs_write, parent(), req, file, bufs, 1, offset); diff --git a/src/uvw/fs_event.hpp b/src/uvw/fs_event.hpp index 58dcb899..55e241e3 100644 --- a/src/uvw/fs_event.hpp +++ b/src/uvw/fs_event.hpp @@ -39,8 +39,8 @@ enum class UVFsEvent: std::underlying_type_t { * It will be emitted by FsEventHandle according with its functionalities. */ struct FsEventEvent: Event { - FsEventEvent(const char * filename, Flags flags) - : filename{filename}, flags{std::move(flags)} + FsEventEvent(const char * _filename, Flags _flags) + : filename{_filename}, flags{std::move(_flags)} {} /** diff --git a/src/uvw/fs_poll.hpp b/src/uvw/fs_poll.hpp index e7fe1508..2294579b 100644 --- a/src/uvw/fs_poll.hpp +++ b/src/uvw/fs_poll.hpp @@ -20,8 +20,8 @@ namespace uvw { * It will be emitted by FsPollHandle according with its functionalities. */ struct FsPollEvent: Event { - explicit FsPollEvent(Stat prev, Stat curr) noexcept - : prev{std::move(prev)}, curr{std::move(curr)} + explicit FsPollEvent(Stat _prev, Stat _curr) noexcept + : prev{std::move(_prev)}, curr{std::move(_curr)} {} Stat prev; /*!< The old Stat struct. */ diff --git a/src/uvw/poll.hpp b/src/uvw/poll.hpp index d1e48499..692f7051 100644 --- a/src/uvw/poll.hpp +++ b/src/uvw/poll.hpp @@ -32,8 +32,8 @@ enum class UVPollEvent: std::underlying_type_t { * It will be emitted by PollHandle according with its functionalities. */ struct PollEvent: Event { - explicit PollEvent(Flags flags) noexcept - : flags{std::move(flags)} + explicit PollEvent(Flags _flags) noexcept + : flags{std::move(_flags)} {} /** diff --git a/src/uvw/stream.hpp b/src/uvw/stream.hpp index ee919239..8a7f17ea 100644 --- a/src/uvw/stream.hpp +++ b/src/uvw/stream.hpp @@ -62,8 +62,8 @@ struct WriteEvent: Event {}; * It will be emitted by StreamHandle according with its functionalities. */ struct DataEvent: Event { - explicit DataEvent(std::unique_ptr data, std::size_t length) noexcept - : data{std::move(data)}, length{length} + explicit DataEvent(std::unique_ptr _data, std::size_t _length) noexcept + : data{std::move(_data)}, length{_length} {} std::unique_ptr data; /*!< A bunch of data read on the stream. */ @@ -97,10 +97,10 @@ class WriteReq final: public Request { public: using Deleter = void(*)(uv_buf_t *); - WriteReq(ConstructorAccess ca, std::shared_ptr loop, std::unique_ptr bufs, std::size_t nbufs) + WriteReq(ConstructorAccess ca, std::shared_ptr loop, std::unique_ptr _bufs, std::size_t _nbufs) : Request{std::move(ca), std::move(loop)}, - bufs{std::move(bufs)}, - nbufs{nbufs} + bufs{std::move(_bufs)}, + nbufs{_nbufs} {} void write(uv_stream_t *handle) { @@ -251,7 +251,7 @@ public: * @param len The lenght of the submitted data. */ void write(std::unique_ptr data, std::size_t len) { - auto write = this->loop().template resource( + auto _write = this->loop().template resource( std::unique_ptr{ new uv_buf_t[1]{ uv_buf_init(data.release(), len) }, [](uv_buf_t *bufs) { delete[] bufs->base; delete[] bufs; } @@ -261,9 +261,9 @@ public: ptr->publish(event); }; - write->template once(listener); - write->template once(listener); - write->write(this->template get()); + _write->template once(listener); + _write->template once(listener); + _write->write(this->template get()); } /** @@ -279,7 +279,7 @@ public: * @param len The lenght of the submitted data. */ void write(char *data, std::size_t len) { - auto write = this->loop().template resource( + auto _write = this->loop().template resource( std::unique_ptr{ new uv_buf_t[1]{ uv_buf_init(data, len) }, [](uv_buf_t *bufs) { delete[] bufs; } @@ -289,9 +289,9 @@ public: ptr->publish(event); }; - write->template once(listener); - write->template once(listener); - write->write(this->template get()); + _write->template once(listener); + _write->template once(listener); + _write->write(this->template get()); } /** @@ -315,7 +315,7 @@ public: */ template void write(S &send, std::unique_ptr data, std::size_t len) { - auto write = this->loop().template resource( + auto _write = this->loop().template resource( std::unique_ptr{ new uv_buf_t[1]{ uv_buf_init(data.release(), len) }, [](uv_buf_t *bufs) { delete[] bufs->base; delete[] bufs; } @@ -325,9 +325,9 @@ public: ptr->publish(event); }; - write->template once(listener); - write->template once(listener); - write->write(this->template get(), send.template get()); + _write->template once(listener); + _write->template once(listener); + _write->write(this->template get(), send.template get()); } /** @@ -351,7 +351,7 @@ public: */ template void write(S &send, char *data, std::size_t len) { - auto write = this->loop().template resource( + auto _write = this->loop().template resource( std::unique_ptr{ new uv_buf_t[1]{ uv_buf_init(data, len) }, [](uv_buf_t *bufs) { delete[] bufs; } @@ -361,9 +361,9 @@ public: ptr->publish(event); }; - write->template once(listener); - write->template once(listener); - write->write(this->template get(), send.template get()); + _write->template once(listener); + _write->template once(listener); + _write->write(this->template get(), send.template get()); } /** diff --git a/src/uvw/tcp.hpp b/src/uvw/tcp.hpp index 18fb3a18..d86dafce 100644 --- a/src/uvw/tcp.hpp +++ b/src/uvw/tcp.hpp @@ -74,8 +74,8 @@ public: * * @param sock A valid socket handle (either a file descriptor or a SOCKET). */ - void open(OSSocketHandle sock) { - invoke(&uv_tcp_open, get(), sock); + void open(OSSocketHandle _sock) { + invoke(&uv_tcp_open, get(), _sock); } /** @@ -133,10 +133,10 @@ public: * @param flags Optional additional flags. */ template - void bind(std::string ip, unsigned int port, Flags flags = Flags{}) { + void bind(std::string ip, unsigned int port, Flags _flags = Flags{}) { typename details::IpTraits::Type addr; details::IpTraits::addrFunc(ip.data(), port, &addr); - invoke(&uv_tcp_bind, get(), reinterpret_cast(&addr), flags); + invoke(&uv_tcp_bind, get(), reinterpret_cast(&addr), _flags); } /** @@ -156,8 +156,8 @@ public: * @param flags Optional additional flags. */ template - void bind(Addr addr, Flags flags = Flags{}) { - bind(addr.ip, addr.port, flags); + void bind(Addr addr, Flags _flags = Flags{}) { + bind(addr.ip, addr.port, _flags); } /** @@ -197,10 +197,10 @@ public: ptr->publish(event); }; - auto connect = loop().resource(); - connect->once(listener); - connect->once(listener); - connect->connect(&uv_tcp_connect, get(), reinterpret_cast(&addr)); + auto _connect = loop().resource(); + _connect->once(listener); + _connect->once(listener); + _connect->connect(&uv_tcp_connect, get(), reinterpret_cast(&addr)); } /** diff --git a/src/uvw/udp.hpp b/src/uvw/udp.hpp index 0ce7762f..913cc66e 100644 --- a/src/uvw/udp.hpp +++ b/src/uvw/udp.hpp @@ -32,8 +32,8 @@ struct SendEvent: Event {}; * It will be emitted by UDPHandle according with its functionalities. */ struct UDPDataEvent: Event { - explicit UDPDataEvent(Addr sender, std::unique_ptr data, std::size_t length, bool partial) noexcept - : data{std::move(data)}, length{length}, sender{std::move(sender)}, partial{partial} + explicit UDPDataEvent(Addr _sender, std::unique_ptr _data, std::size_t _length, bool _partial) noexcept + : data{std::move(_data)}, length{_length}, sender{std::move(_sender)}, partial{_partial} {} std::unique_ptr data; /*!< A bunch of data read on the stream. */ @@ -62,10 +62,10 @@ class SendReq final: public Request { public: using Deleter = void(*)(uv_buf_t *); - SendReq(ConstructorAccess ca, std::shared_ptr loop, std::unique_ptr bufs, std::size_t nbufs) + SendReq(ConstructorAccess ca, std::shared_ptr loop, std::unique_ptr _bufs, std::size_t _nbufs) : Request{std::move(ca), std::move(loop)}, - bufs{std::move(bufs)}, - nbufs{nbufs} + bufs{std::move(_bufs)}, + nbufs{_nbufs} {} void send(uv_udp_t *handle, const struct sockaddr* addr) { @@ -154,8 +154,8 @@ public: * * @param sock A valid socket handle (either a file descriptor or a SOCKET). */ - void open(OSSocketHandle sock) { - invoke(&uv_udp_open, get(), sock); + void open(OSSocketHandle _sock) { + invoke(&uv_udp_open, get(), _sock); } /** @@ -175,10 +175,10 @@ public: * @param flags Optional additional flags. */ template - void bind(std::string ip, unsigned int port, Flags flags = Flags{}) { + void bind(std::string ip, unsigned int port, Flags _flags = Flags{}) { typename details::IpTraits::Type addr; details::IpTraits::addrFunc(ip.data(), port, &addr); - invoke(&uv_udp_bind, get(), reinterpret_cast(&addr), flags); + invoke(&uv_udp_bind, get(), reinterpret_cast(&addr), _flags); } /** @@ -197,8 +197,8 @@ public: * @param flags Optional additional flags. */ template - void bind(Addr addr, Flags flags = Flags{}) { - bind(addr.ip, addr.port, flags); + void bind(Addr addr, Flags _flags = Flags{}) { + bind(addr.ip, addr.port, _flags); } /** @@ -300,7 +300,7 @@ public: typename details::IpTraits::Type addr; details::IpTraits::addrFunc(ip.data(), port, &addr); - auto send = loop().resource( + auto _send = loop().resource( std::unique_ptr{ new uv_buf_t[1]{ uv_buf_init(data.release(), len) }, [](uv_buf_t *bufs) { delete[] bufs->base; delete[] bufs; } @@ -310,9 +310,9 @@ public: ptr->publish(event); }; - send->once(listener); - send->once(listener); - send->send(get(), reinterpret_cast(&addr)); + _send->once(listener); + _send->once(listener); + _send->send(get(), reinterpret_cast(&addr)); } /** @@ -338,7 +338,7 @@ public: typename details::IpTraits::Type addr; details::IpTraits::addrFunc(ip.data(), port, &addr); - auto send = loop().resource( + auto _send = loop().resource( std::unique_ptr{ new uv_buf_t[1]{ uv_buf_init(data, len) }, [](uv_buf_t *bufs) { delete[] bufs; } @@ -348,9 +348,9 @@ public: ptr->publish(event); }; - send->once(listener); - send->once(listener); - send->send(get(), reinterpret_cast(&addr)); + _send->once(listener); + _send->once(listener); + _send->send(get(), reinterpret_cast(&addr)); } /** diff --git a/src/uvw/util.hpp b/src/uvw/util.hpp index 5b2b3db6..8a410f81 100644 --- a/src/uvw/util.hpp +++ b/src/uvw/util.hpp @@ -185,7 +185,7 @@ using RUsage = uv_rusage_t; struct Passwd { - Passwd(std::shared_ptr passwd): passwd{passwd} {} + Passwd(std::shared_ptr _passwd): passwd{_passwd} {} std::string username() const noexcept { return passwd->username; } Uid uid() const noexcept { return passwd->uid; }