Merge branch 'master' into matrices

8 files changed, 9 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f9e8468..7a14759 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -68,8 +68,8 @@ set_target_properties(mm PROPERTIES EXPORT_NAME MM)
 # install public headers
 install(
     FILES 
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/mmvec.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/mm
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/mm/mmvec.hpp
+        ${CMAKE_CURRENT_SOURCE_DIR}/include/mm/mm.hpp
     DESTINATION
         ${CMAKE_INSTALL_INCLUDEDIR}/mm
 )
diff --git a/include/mm b/include/mm/mm.hpp
index 7e9f02b..7e9f02b 100644
--- a/include/mm
+++ b/include/mm/mm.hpp
diff --git a/include/mmmatrix.hpp b/include/mm/mmmatrix.hpp
index 5285429..5285429 100644
--- a/include/mmmatrix.hpp
+++ b/include/mm/mmmatrix.hpp
diff --git a/include/mmvec.hpp b/include/mm/mmvec.hpp
index 21e91b5..1939388 100644
--- a/include/mmvec.hpp
+++ b/include/mm/mmvec.hpp
@@ -222,10 +222,7 @@ std::ostream& operator<<(std::ostream& os, const mm::basic_vec<T, d>& v) {
 template<typename T, std::size_t d>
 class mm::vec: public mm::basic_vec<T, d> {
 public:
-    vec(std::initializer_list<T> l) : basic_vec<T, d>(l) {}
-
-    template<std::size_t n>
-    vec(const basic_vec<T, n>& other) : basic_vec<T, d>(other) {}
+    using mm::basic_vec<T, d>::basic_vec;
 };
 
 
@@ -235,11 +232,7 @@ public:
 template<typename T>
 class mm::vec3 : public mm::basic_vec<T, 3> {
 public:
-    vec3() : basic_vec<T, 3>() {}
-    vec3(std::initializer_list<T> l) : basic_vec<T, 3>(l) {}
-
-    template<std::size_t n>
-    vec3(const basic_vec<T, n>& other) : basic_vec<T, 3>(other) {}
+    using mm::basic_vec<T, 3>::basic_vec;
 
     T& x() { return this->at(0); }
     T& y() { return this->at(1); }
@@ -293,11 +286,7 @@ mm::vec3<T> mm::vec3<T>::cross(const vec3<T>& rhs, const vec3<T>& lhs) {
 template<typename T>
 class mm::vec2: public mm::basic_vec<T, 2> {
 public:
-    vec2() : basic_vec<T, 2>() {}
-    vec2(std::initializer_list<T> l) : basic_vec<T, 2>(l) {}
-
-    template<std::size_t n>
-    vec2(const basic_vec<T, n>& other) : basic_vec<T, 2>(other) {}
+    using mm::basic_vec<T, 2>::basic_vec;
 
     T& x() { return this->at(0); }
     T& y() { return this->at(1); }
diff --git a/mmmatrix.cpp b/mmmatrix.cpp
index a352413..c0ce9eb 100644
--- a/mmmatrix.cpp
+++ b/mmmatrix.cpp
@@ -1 +1 @@
-#include "mmmatrix.hpp"
+#include "mm/mmmatrix.hpp"
diff --git a/mmvec.cpp b/mmvec.cpp
index f555a6e..95c68f1 100644
--- a/mmvec.cpp
+++ b/mmvec.cpp
@@ -1 +1 @@
-#include "mmvec.hpp"
+#include "mm/mmvec.hpp"
diff --git a/test/matrix_example.cpp b/test/matrix_example.cpp
index 469cbff..e7f6580 100644
--- a/test/matrix_example.cpp
+++ b/test/matrix_example.cpp
@@ -1,4 +1,4 @@
-#include "mmmatrix.hpp"
+#include "mm/mmmatrix.hpp"
 
 #include <iostream>
 #include <complex>
diff --git a/test/vec_example.cpp b/test/vec_example.cpp
index 3a00f58..14b9680 100644
--- a/test/vec_example.cpp
+++ b/test/vec_example.cpp
@@ -1,4 +1,4 @@
-#include "mmvec.hpp"
+#include "mm/mmvec.hpp"
 
 #include <iostream>
 #include <complex>