Mover wrapper_base to a dedicated file

Author: JohanMabille

CMakeLists.txt

@@ -57,6 +57,7 @@ set(GIT2CPP_SRC
     ${GIT2CPP_SOURCE_DIR}/wrapper/repository_wrapper.hpp
     ${GIT2CPP_SOURCE_DIR}/wrapper/status_wrapper.cpp
     ${GIT2CPP_SOURCE_DIR}/wrapper/status_wrapper.hpp
+    ${GIT2CPP_SOURCE_DIR}/wrapper/wrapper_base.hpp
     ${GIT2CPP_SOURCE_DIR}/main.cpp
     ${GIT2CPP_SOURCE_DIR}/version.hpp
 )

src/utils/common.hpp

@@ -19,38 +19,6 @@ class noncopyable_nonmovable
     ~noncopyable_nonmovable() = default;
 };
 
-template <class T>
-class wrapper_base
-{
-public:
-    using resource_type = T;
-
-    wrapper_base(const wrapper_base&) = delete;
-    wrapper_base& operator=(const wrapper_base&) = delete;
-
-    wrapper_base(wrapper_base&& rhs)
-        : p_resource(rhs.p_resource)
-    {
-        rhs.p_resource = nullptr;
-    }
-    wrapper_base& operator=(wrapper_base&& rhs)
-    {
-        std::swap(p_resource, rhs.p_resource);
-        return *this;
-    }
-
-    operator resource_type*() const noexcept
-    {
-        return p_resource;
-    }
-
-protected:
-    // Allocation and deletion of p_resource must be handled by inheriting class.
-    wrapper_base() = default;
-    ~wrapper_base() = default;
-    resource_type* p_resource = nullptr;
-};
-
 class libgit2_object : private noncopyable_nonmovable
 {
 public:

src/wrapper/index_wrapper.hpp

@@ -6,6 +6,7 @@
 #include <git2.h>
 
 #include "../utils/common.hpp"
+#include "../wrapper/wrapper_base.hpp"
 
 class repository_wrapper;
 

src/wrapper/refs_wrapper.hpp

@@ -5,6 +5,7 @@
 #include <git2.h>
 
 #include "../wrapper/repository_wrapper.hpp"
+#include "../wrapper/wrapper_base.hpp"
 
 class reference_wrapper : public wrapper_base<git_reference>
 {

src/wrapper/repository_wrapper.hpp

@@ -6,6 +6,7 @@
 
 #include "../utils/common.hpp"
 #include "../wrapper/index_wrapper.hpp"
+#include "../wrapper/wrapper_base.hpp"
 
 class repository_wrapper : public wrapper_base<git_repository>
 {

src/wrapper/status_wrapper.hpp

@@ -6,6 +6,7 @@
 #include <git2.h>
 
 #include "../wrapper/repository_wrapper.hpp"
+#include "../wrapper/wrapper_base.hpp"
 
 class status_list_wrapper : public wrapper_base<git_status_list>
 {

src/wrapper/wrapper_base.hpp

@@ -0,0 +1,35 @@
+#pragma once
+
+
+template <class T>
+class wrapper_base
+{
+public:
+    using resource_type = T;
+
+    wrapper_base(const wrapper_base&) = delete;
+    wrapper_base& operator=(const wrapper_base&) = delete;
+
+    wrapper_base(wrapper_base&& rhs)
+        : p_resource(rhs.p_resource)
+    {
+        rhs.p_resource = nullptr;
+    }
+    wrapper_base& operator=(wrapper_base&& rhs)
+    {
+        std::swap(p_resource, rhs.p_resource);
+        return *this;
+    }
+
+    operator resource_type*() const noexcept
+    {
+        return p_resource;
+    }
+
+protected:
+    // Allocation and deletion of p_resource must be handled by inheriting class.
+    wrapper_base() = default;
+    ~wrapper_base() = default;
+
+    resource_type* p_resource = nullptr;
+};