Inlined defer

common/utility.h

@@ -74,25 +74,25 @@ ptr_array_t<T> ptr_array(T* pbegin, size_t n)
     return {pbegin, pbegin + n};
 }
 
+#define __INLINE__ __attribute__((always_inline))
+#define __FORCE_INLINE__ __INLINE__ inline
+
 template<typename T>
 class Defer
 {
 public:
-    Defer(T fn) : m_func(fn) {}
-    ~Defer() { m_func(); }
+    Defer(T fn) __INLINE__ : m_func(fn) {}
+    ~Defer() __INLINE__ { m_func(); }
     void operator=(const Defer<T>&) = delete;
     operator bool () { return true; }   // if (DEFER(...)) { ... }
 
 private:
     T m_func;
 };
 
-template<typename T>
+template<typename T> __FORCE_INLINE__
 Defer<T> make_defer(T func) { return Defer<T>(func); }
 
-#define __INLINE__ __attribute__((always_inline))
-#define __FORCE_INLINE__ __INLINE__ inline
-
 #define _CONCAT_(a, b) a##b
 #define _CONCAT(a, b) _CONCAT_(a, b)
 

net/http/client.cpp

@@ -120,9 +120,7 @@ class ClientImpl : public Client {
     CommonHeaders<> m_common_headers;
     ICookieJar *m_cookie_jar;
     ClientImpl(ICookieJar *cookie_jar, TLSContext *tls_ctx) :
-        m_cookie_jar(cookie_jar),
-        m_dialer(tls_ctx) {
-    }
+        m_dialer(tls_ctx), m_cookie_jar(cookie_jar) { }
 
     using SocketStream_ptr = std::unique_ptr<ISocketStream>;
     int redirect(Operation* op) {