summaryrefslogtreecommitdiff
path: root/src/KqueueEventPoll.h
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2016-03-26 17:12:52 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2016-03-26 17:20:27 +0900
commitd64089632e82a2548752c7a6baaa68365a795a74 (patch)
tree57fc7b85a8c1290975d58fa4761b04a7695bf7e3 /src/KqueueEventPoll.h
parentc81b1321122e8509b55c94c0cbca0d8d6d319f0c (diff)
parenta7cd943a06b1a5ff4515b57060b84037f8d01f9f (diff)
Merge branch 'master' into random-webseeding
Diffstat (limited to 'src/KqueueEventPoll.h')
-rw-r--r--src/KqueueEventPoll.h26
1 files changed, 12 insertions, 14 deletions
diff --git a/src/KqueueEventPoll.h b/src/KqueueEventPoll.h
index a5fdcf47..4e22b2d8 100644
--- a/src/KqueueEventPoll.h
+++ b/src/KqueueEventPoll.h
@@ -46,7 +46,7 @@
#include "Event.h"
#include "a2functional.h"
#ifdef ENABLE_ASYNC_DNS
-# include "AsyncNameResolver.h"
+#include "AsyncNameResolver.h"
#endif // ENABLE_ASYNC_DNS
namespace aria2 {
@@ -62,8 +62,7 @@ private:
typedef AsyncNameResolverEntry<KqueueEventPoll> KAsyncNameResolverEntry;
friend class AsyncNameResolverEntry<KqueueEventPoll>;
- class KSocketEntry:
- public SocketEntry<KCommandEvent, KADNSEvent> {
+ class KSocketEntry : public SocketEntry<KCommandEvent, KADNSEvent> {
public:
KSocketEntry(sock_t socket);
@@ -113,20 +112,19 @@ public:
virtual void poll(const struct timeval& tv) CXX11_OVERRIDE;
- virtual bool addEvents(sock_t socket,
- Command* command, EventPoll::EventType events)
- CXX11_OVERRIDE;
+ virtual bool addEvents(sock_t socket, Command* command,
+ EventPoll::EventType events) CXX11_OVERRIDE;
- virtual bool deleteEvents(sock_t socket,
- Command* command, EventPoll::EventType events)
- CXX11_OVERRIDE;
+ virtual bool deleteEvents(sock_t socket, Command* command,
+ EventPoll::EventType events) CXX11_OVERRIDE;
#ifdef ENABLE_ASYNC_DNS
- virtual bool addNameResolver(const std::shared_ptr<AsyncNameResolver>& resolver,
- Command* command) CXX11_OVERRIDE;
- virtual bool deleteNameResolver
- (const std::shared_ptr<AsyncNameResolver>& resolver, Command* command)
- CXX11_OVERRIDE;
+ virtual bool
+ addNameResolver(const std::shared_ptr<AsyncNameResolver>& resolver,
+ Command* command) CXX11_OVERRIDE;
+ virtual bool
+ deleteNameResolver(const std::shared_ptr<AsyncNameResolver>& resolver,
+ Command* command) CXX11_OVERRIDE;
#endif // ENABLE_ASYNC_DNS
static const int IEV_READ = POLLIN;