Scope Guard base class moved into a dedicated file. The class is in the

namespace 'detail' now.

include/scope_exit.h

@@ -20,93 +20,17 @@
 
 #pragma once
 
-#include <utility>
-#include <type_traits>
+#include "scope_guard_base.h"
 
 namespace sr
 {
-    template<class EF>
-    class scope_guard_base
-    {
-    public:
-
-        template<class EFP,
-            std::enable_if_t<std::is_constructible<EF, EFP>::value, int> = 0,
-            std::enable_if_t<(!std::is_lvalue_reference<EFP>::value)
-                                && std::is_nothrow_constructible<EF, EFP>::value, int> = 0
-            >
-        explicit scope_guard_base(EFP&& exitFunction) : m_exitFunction(std::move(exitFunction)), m_execute_on_destruction(true)
-        {
-        }
-
-        template<class EFP,
-            std::enable_if_t<std::is_constructible<EF, EFP>::value, int> = 0,
-            std::enable_if_t<std::is_lvalue_reference<EFP>::value, int> = 0
-            >
-        explicit scope_guard_base(EFP&& exitFunction) try : m_exitFunction(exitFunction), m_execute_on_destruction(true)
-        {
-        }
-        catch( ... )
-        {
-            exitFunction();
-            throw;
-        }
-
-        template<class T = EF,
-            std::enable_if_t<std::is_nothrow_move_constructible<T>::value, int> = 0
-            >
-        scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<T>::value || std::is_nothrow_copy_constructible<T>::value)
-                                        : m_exitFunction(std::move(other.m_exitFunction)),
-                                        m_execute_on_destruction(other.m_execute_on_destruction)
-        {
-            other.release();
-        }
-
-        template<class T = EF,
-            std::enable_if_t<!std::is_nothrow_move_constructible<T>::value, int> = 0
-            >
-        scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<T>::value || std::is_nothrow_copy_constructible<T>::value)
-                                        : m_exitFunction(other.m_exitFunction),
-                                        m_execute_on_destruction(other.m_execute_on_destruction)
-        {
-            other.release();
-        }
-
-        scope_guard_base(const scope_guard_base&) = delete;
-
-        ~scope_guard_base() noexcept(true)
-        {
-            if( m_execute_on_destruction == true )
-            {
-                m_exitFunction();
-            }
-        }
-
-
-        void release() noexcept
-        {
-            m_execute_on_destruction = false;
-        }
-
-
-        scope_guard_base& operator=(const scope_guard_base&) = delete;
-        scope_guard_base& operator=(scope_guard_base&&) = delete;
-
-
-    protected:
-
-        EF m_exitFunction;
-        bool m_execute_on_destruction;
-    };
-
-
 
     template<class EF>
-    class scope_exit : public scope_guard_base<EF>
+    class scope_exit : public detail::scope_guard_base<EF>
     {
     public:
 
-        using scope_guard_base<EF>::scope_guard_base;
+        using detail::scope_guard_base<EF>::scope_guard_base;
 
 
     private:

include/scope_guard_base.h

@@ -0,0 +1,106 @@
+/*
+ * Scope Guard
+ * Copyright (C) 2017  offa
+ *
+ * This file is part of Scope Guard.
+ *
+ * Scope Guard is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Scope Guard is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Scope Guard.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <utility>
+#include <type_traits>
+
+namespace sr
+{
+namespace detail
+{
+
+    template<class EF>
+    class scope_guard_base
+    {
+    public:
+
+        template<class EFP,
+            std::enable_if_t<std::is_constructible<EF, EFP>::value, int> = 0,
+            std::enable_if_t<(!std::is_lvalue_reference<EFP>::value)
+                                && std::is_nothrow_constructible<EF, EFP>::value, int> = 0
+            >
+        explicit scope_guard_base(EFP&& exitFunction) : m_exitFunction(std::move(exitFunction)), m_execute_on_destruction(true)
+        {
+        }
+
+        template<class EFP,
+            std::enable_if_t<std::is_constructible<EF, EFP>::value, int> = 0,
+            std::enable_if_t<std::is_lvalue_reference<EFP>::value, int> = 0
+            >
+        explicit scope_guard_base(EFP&& exitFunction) try : m_exitFunction(exitFunction), m_execute_on_destruction(true)
+        {
+        }
+        catch( ... )
+        {
+            exitFunction();
+            throw;
+        }
+
+        template<class T = EF,
+            std::enable_if_t<std::is_nothrow_move_constructible<T>::value, int> = 0
+            >
+        scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<T>::value || std::is_nothrow_copy_constructible<T>::value)
+                                        : m_exitFunction(std::move(other.m_exitFunction)),
+                                        m_execute_on_destruction(other.m_execute_on_destruction)
+        {
+            other.release();
+        }
+
+        template<class T = EF,
+            std::enable_if_t<!std::is_nothrow_move_constructible<T>::value, int> = 0
+            >
+        scope_guard_base(scope_guard_base&& other) noexcept(std::is_nothrow_move_constructible<T>::value || std::is_nothrow_copy_constructible<T>::value)
+                                        : m_exitFunction(other.m_exitFunction),
+                                        m_execute_on_destruction(other.m_execute_on_destruction)
+        {
+            other.release();
+        }
+
+        scope_guard_base(const scope_guard_base&) = delete;
+
+        ~scope_guard_base() noexcept(true)
+        {
+            if( m_execute_on_destruction == true )
+            {
+                m_exitFunction();
+            }
+        }
+
+
+        void release() noexcept
+        {
+            m_execute_on_destruction = false;
+        }
+
+
+        scope_guard_base& operator=(const scope_guard_base&) = delete;
+        scope_guard_base& operator=(scope_guard_base&&) = delete;
+
+
+    protected:
+
+        EF m_exitFunction;
+        bool m_execute_on_destruction;
+    };
+
+}
+}