Commits

Jeff Hardy committed cb8cef5

Fix inline functions and scalar mul/div.

  • Participants
  • Parent commits b664699

Comments (0)

Files changed (1)

File Matrix/Matrix/Matrix.h

         return result;
     }
 
-    Matrix_detail::identity_matrix_builder identity_matrix()
+    inline Matrix_detail::identity_matrix_builder identity_matrix()
     {
         return Matrix_detail::identity_matrix_builder();
     }
         return result;
     }
 
-    Matrix_detail::zero_matrix_builder zero_matrix()
+    inline Matrix_detail::zero_matrix_builder zero_matrix()
     {
         return Matrix_detail::zero_matrix_builder();
     }
         return result;
     }
 
-    template<class T, int Rows, int Cols>
-    Matrix<T, Rows, Cols> operator*(Matrix<T, Rows, Cols> m, T s)
+    template<class T, class U, int Rows, int Cols>
+    Matrix<T, Rows, Cols> operator*(Matrix<T, Rows, Cols> m, U s)
     {
         return m *= s;
     }
 
-    template<class T, int Rows, int Cols>
-    Matrix<T, Rows, Cols> operator/(Matrix<T, Rows, Cols> m, T s)
+    template<class T, class U, int Rows, int Cols>
+    Matrix<T, Rows, Cols> operator/(Matrix<T, Rows, Cols> m, U s)
     {
         return m /= s;
     }