newtype: merge version header to main header

7 files changed, 18 insertions, 32 deletions

diff --git a/source/lib/include/newtype/derivable.hpp b/source/lib/include/newtype/derivable.hpp
index c798c59..d4bd559 100644
--- a/source/lib/include/newtype/derivable.hpp
+++ b/source/lib/include/newtype/derivable.hpp
@@ -1,8 +1,6 @@
 #ifndef NEWTYPE_DERIVABLE_HPP
 #define NEWTYPE_DERIVABLE_HPP
 
-#include "newtype/version.hpp"
-
 namespace nt
 {
 
diff --git a/source/lib/include/newtype/derivation_clause.hpp b/source/lib/include/newtype/derivation_clause.hpp
index eb3e8f1..1b9f48e 100644
--- a/source/lib/include/newtype/derivation_clause.hpp
+++ b/source/lib/include/newtype/derivation_clause.hpp
@@ -2,7 +2,6 @@
 #define NEWTYPE_DERIVATION_CLAUSE_HPP
 
 #include "newtype/derivable.hpp"
-#include "newtype/version.hpp"
 
 #include <type_traits>
 
diff --git a/source/lib/include/newtype/deriving.hpp b/source/lib/include/newtype/deriving.hpp
index ae10bab..cbb1885 100644
--- a/source/lib/include/newtype/deriving.hpp
+++ b/source/lib/include/newtype/deriving.hpp
@@ -3,7 +3,6 @@
 
 #include "newtype/derivable.hpp"
 #include "newtype/derivation_clause.hpp"
-#include "newtype/version.hpp"
 
 #include <type_traits>
 
diff --git a/source/lib/include/newtype/impl/new_type_iterator_types.hpp b/source/lib/include/newtype/impl/new_type_iterator_types.hpp
index 2ea8274..cda0221 100644
--- a/source/lib/include/newtype/impl/new_type_iterator_types.hpp
+++ b/source/lib/include/newtype/impl/new_type_iterator_types.hpp
@@ -1,8 +1,6 @@
 #ifndef NEWTYPE_IMPL_NEW_TYPE_ITERATOR_TYPES_HPP
 #define NEWTYPE_IMPL_NEW_TYPE_ITERATOR_TYPES_HPP
 
-#include "newtype/version.hpp"
-
 #include <type_traits>
 
 namespace nt::impl
diff --git a/source/lib/include/newtype/impl/new_type_storage.hpp b/source/lib/include/newtype/impl/new_type_storage.hpp
index f7842af..5cec601 100644
--- a/source/lib/include/newtype/impl/new_type_storage.hpp
+++ b/source/lib/include/newtype/impl/new_type_storage.hpp
@@ -1,8 +1,6 @@
 #ifndef NEWTYPE_IMPL_NEW_TYPE_STORAGE_HPP
 #define NEWTYPE_IMPL_NEW_TYPE_STORAGE_HPP
 
-#include "newtype/version.hpp"
-
 #include <type_traits>
 #include <utility>
 
diff --git a/source/lib/include/newtype/newtype.hpp b/source/lib/include/newtype/newtype.hpp
index 5a1d936..d5c4493 100644
--- a/source/lib/include/newtype/newtype.hpp
+++ b/source/lib/include/newtype/newtype.hpp
@@ -5,7 +5,6 @@
 #include "newtype/deriving.hpp"
 #include "newtype/impl/new_type_iterator_types.hpp"
 #include "newtype/impl/new_type_storage.hpp"
-#include "newtype/version.hpp"
 
 #include <functional>
 #include <istream>
@@ -15,6 +14,24 @@
 namespace nt
 {
 
+  inline namespace lib
+  {
+    constexpr struct
+    {
+      int const major;
+      int const minor;
+      int const patch;
+
+      char const * const name;
+    } version{
+        .major = 2,
+        .minor = 0,
+        .patch = 0,
+        .name = "Brynn",
+    };
+
+  }  // namespace lib
+
   namespace concepts
   {
 
diff --git a/source/lib/include/newtype/version.hpp b/source/lib/include/newtype/version.hpp
deleted file mode 100644
index e4eba54..0000000
--- a/source/lib/include/newtype/version.hpp
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef NEWTYPE_VERSION_HPP
-#define NEWTYPE_VERSION_HPP
-
-namespace nt
-{
-
-  constexpr struct
-  {
-    int const major;
-    int const minor;
-    int const patch;
-
-    char const * const name;
-  } version{
-      .major = 2,
-      .minor = 0,
-      .patch = 0,
-      .name = "Brynn",
-  };
-
-}  // namespace nt
-
-#endif
\ No newline at end of file