From 87cf6523975fe395703fd3093acfef8ef835a408 Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Tue, 2 Aug 2016 12:38:34 +0200
Subject: [PATCH] minor changes

---
 src/uvw/event.hpp | 10 +++++++---
 src/uvw/util.hpp  | 13 ++++---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/uvw/event.hpp b/src/uvw/event.hpp
index 169e1f8f..48fc0361 100644
--- a/src/uvw/event.hpp
+++ b/src/uvw/event.hpp
@@ -10,8 +10,11 @@
 namespace uvw {
 
 
+namespace details {
+
+
 struct BaseEvent {
-    virtual ~BaseEvent() noexcept = 0;
+    virtual ~BaseEvent() noexcept { }
 
     static std::size_t next() noexcept {
         static std::size_t cnt = 0;
@@ -19,11 +22,12 @@ struct BaseEvent {
     }
 };
 
-BaseEvent::~BaseEvent() noexcept { }
+
+}
 
 
 template<typename E>
-struct Event: BaseEvent {
+struct Event: details::BaseEvent {
     static std::size_t type() noexcept {
         static std::size_t val = BaseEvent::next();
         return val;
diff --git a/src/uvw/util.hpp b/src/uvw/util.hpp
index a08e6862..10b96dcc 100644
--- a/src/uvw/util.hpp
+++ b/src/uvw/util.hpp
@@ -99,8 +99,8 @@ struct IpTraits<IPv4> {
     using Type = sockaddr_in;
     using AddrFuncType = int(*)(const char *, int, sockaddr_in *);
     using NameFuncType = int(*)(const sockaddr_in *, char *, std::size_t);
-    static const AddrFuncType AddrFunc;
-    static const NameFuncType NameFunc;
+    static constexpr AddrFuncType AddrFunc = &uv_ip4_addr;
+    static constexpr NameFuncType NameFunc = &uv_ip4_name;
 };
 
 template<>
@@ -108,15 +108,10 @@ struct IpTraits<IPv6> {
     using Type = sockaddr_in6;
     using AddrFuncType = int(*)(const char *, int, sockaddr_in6 *);
     using NameFuncType = int(*)(const sockaddr_in6 *, char *, std::size_t);
-    static const AddrFuncType AddrFunc;
-    static const NameFuncType NameFunc;
+    static constexpr AddrFuncType AddrFunc = &uv_ip6_addr;
+    static constexpr NameFuncType NameFunc = &uv_ip6_name;
 };
 
-const IpTraits<IPv4>::AddrFuncType IpTraits<IPv4>::AddrFunc = &uv_ip4_addr;
-const IpTraits<IPv6>::AddrFuncType IpTraits<IPv6>::AddrFunc = &uv_ip6_addr;
-const IpTraits<IPv4>::NameFuncType IpTraits<IPv4>::NameFunc = &uv_ip4_name;
-const IpTraits<IPv6>::NameFuncType IpTraits<IPv6>::NameFunc = &uv_ip6_name;
-
 
 template<typename I>
 Addr address(const typename details::IpTraits<I>::Type *aptr, int len) noexcept {