luo980/uvw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

poll handle: rename variable to avoid clashing (close #236)

Browse Source
This commit is contained in:
Michele Caini 2021-02-11 23:26:30 +01:00
parent 2ea56b1dd1
commit d799a7fc85
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/uvw/poll.cpp
View File

@ -16,7 +16,7 @@ UVW_INLINE PollEvent::PollEvent(Flags<details::UVPollEvent> events) noexcept
UVW_INLINE PollHandle::PollHandle(ConstructorAccess ca, std::shared_ptr<Loop> ref, int desc) UVW_INLINE PollHandle::PollHandle(ConstructorAccess ca, std::shared_ptr<Loop> ref, int desc)
: Handle{ca, std::move(ref)}, tag{FD}, fd{desc} : Handle{ca, std::move(ref)}, tag{FD}, file_desc{desc}
{} {}
@ -37,7 +37,7 @@ UVW_INLINE void PollHandle::startCallback(uv_poll_t *handle, int status, int eve
UVW_INLINE bool PollHandle::init() { UVW_INLINE bool PollHandle::init() {
return (tag == SOCKET) ? initialize(&uv_poll_init_socket, socket) : initialize(&uv_poll_init, fd); return (tag == SOCKET) ? initialize(&uv_poll_init_socket, socket) : initialize(&uv_poll_init, file_desc);
} }

2
src/uvw/poll.h
View File

@ -129,7 +129,7 @@ public:
private: private:
enum { FD, SOCKET } tag; enum { FD, SOCKET } tag;
union { union {
int fd; int file_desc;
OSSocketHandle::Type socket; OSSocketHandle::Type socket;
}; };
}; };