From 1fb0f33eb4db5e7b77f5692c64faf161ad7d7160 Mon Sep 17 00:00:00 2001 From: jgoppert Date: Sat, 7 Nov 2015 11:08:17 -0500 Subject: [PATCH] Removed old references to matrix.hpp. --- CMakeLists.txt | 2 +- matrix/Dcm.hpp | 2 +- matrix/Euler.hpp | 2 +- matrix/Matrix.hpp | 2 +- matrix/Quaternion.hpp | 2 +- matrix/Scalar.hpp | 2 +- matrix/SquareMatrix.hpp | 2 +- matrix/Vector.hpp | 2 +- matrix/Vector3.hpp | 2 +- matrix/filter.hpp | 2 +- test/attitude.cpp | 2 +- test/filter.cpp | 2 +- test/inverse.cpp | 2 +- test/matrixAssignment.cpp | 2 +- test/matrixMult.cpp | 2 +- test/matrixScalarMult.cpp | 2 +- test/setIdentity.cpp | 2 +- test/squareMatrix.cpp | 2 +- test/transpose.cpp | 2 +- test/vector.cpp | 2 +- test/vector3.cpp | 2 +- test/vectorAssignment.cpp | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e63caf230..63619ebcfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,7 +63,7 @@ string(REPLACE ";" " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") enable_testing() -include_directories(matrix) +include_directories(${CMAKE_SOURCE_DIR}) file(GLOB_RECURSE COV_SRCS matrix/*.hpp matrix/*.cpp) diff --git a/matrix/Dcm.hpp b/matrix/Dcm.hpp index 6740a44384..c94e890cfb 100644 --- a/matrix/Dcm.hpp +++ b/matrix/Dcm.hpp @@ -8,7 +8,7 @@ #pragma once -#include "matrix.hpp" +#include "math.hpp" namespace matrix diff --git a/matrix/Euler.hpp b/matrix/Euler.hpp index eb5d2fc759..3fe125d62c 100644 --- a/matrix/Euler.hpp +++ b/matrix/Euler.hpp @@ -8,7 +8,7 @@ #pragma once -#include "matrix.hpp" +#include "math.hpp" #include diff --git a/matrix/Matrix.hpp b/matrix/Matrix.hpp index 45e22b6307..d06cef3755 100644 --- a/matrix/Matrix.hpp +++ b/matrix/Matrix.hpp @@ -14,7 +14,7 @@ #include #include -#include "matrix.hpp" +#include "math.hpp" namespace matrix { diff --git a/matrix/Quaternion.hpp b/matrix/Quaternion.hpp index 96a9497277..a6b25b281f 100644 --- a/matrix/Quaternion.hpp +++ b/matrix/Quaternion.hpp @@ -8,7 +8,7 @@ #pragma once -#include "matrix.hpp" +#include "math.hpp" namespace matrix { diff --git a/matrix/Scalar.hpp b/matrix/Scalar.hpp index 6523060f12..628e8b10e7 100644 --- a/matrix/Scalar.hpp +++ b/matrix/Scalar.hpp @@ -14,7 +14,7 @@ #include #include -#include "matrix.hpp" +#include "math.hpp" namespace matrix { diff --git a/matrix/SquareMatrix.hpp b/matrix/SquareMatrix.hpp index a3dbdc6c78..ffbe1045af 100644 --- a/matrix/SquareMatrix.hpp +++ b/matrix/SquareMatrix.hpp @@ -14,7 +14,7 @@ #include #include -#include "matrix.hpp" +#include "math.hpp" namespace matrix { diff --git a/matrix/Vector.hpp b/matrix/Vector.hpp index a65b5dfff0..c0184dac8c 100644 --- a/matrix/Vector.hpp +++ b/matrix/Vector.hpp @@ -7,7 +7,7 @@ */ #pragma once -#include "matrix.hpp" +#include "math.hpp" namespace matrix { diff --git a/matrix/Vector3.hpp b/matrix/Vector3.hpp index 0629099088..5a3d5c8376 100644 --- a/matrix/Vector3.hpp +++ b/matrix/Vector3.hpp @@ -8,7 +8,7 @@ #pragma once -#include "matrix.hpp" +#include "math.hpp" namespace matrix { diff --git a/matrix/filter.hpp b/matrix/filter.hpp index 666db0926e..e202bb8827 100644 --- a/matrix/filter.hpp +++ b/matrix/filter.hpp @@ -1,6 +1,6 @@ #pragma once -#include "matrix.hpp" +#include "math.hpp" namespace matrix { diff --git a/test/attitude.cpp b/test/attitude.cpp index 3d38aa9d94..88faeaff69 100644 --- a/test/attitude.cpp +++ b/test/attitude.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/filter.cpp b/test/filter.cpp index b4103d566c..86ca564bec 100644 --- a/test/filter.cpp +++ b/test/filter.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/inverse.cpp b/test/inverse.cpp index ba85fae463..d00fcd6cf2 100644 --- a/test/inverse.cpp +++ b/test/inverse.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/matrixAssignment.cpp b/test/matrixAssignment.cpp index 8202920a4a..86c05527e5 100644 --- a/test/matrixAssignment.cpp +++ b/test/matrixAssignment.cpp @@ -1,6 +1,6 @@ #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/matrixMult.cpp b/test/matrixMult.cpp index 6ac0670065..5ba8b72254 100644 --- a/test/matrixMult.cpp +++ b/test/matrixMult.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/matrixScalarMult.cpp b/test/matrixScalarMult.cpp index be093d03fb..e6bb8323a9 100644 --- a/test/matrixScalarMult.cpp +++ b/test/matrixScalarMult.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/setIdentity.cpp b/test/setIdentity.cpp index c4e8830603..68c2acf31b 100644 --- a/test/setIdentity.cpp +++ b/test/setIdentity.cpp @@ -1,6 +1,6 @@ #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/squareMatrix.cpp b/test/squareMatrix.cpp index 91a3f36fbd..e2a56ed048 100644 --- a/test/squareMatrix.cpp +++ b/test/squareMatrix.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/transpose.cpp b/test/transpose.cpp index fe28077063..f032862a4d 100644 --- a/test/transpose.cpp +++ b/test/transpose.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/vector.cpp b/test/vector.cpp index 7cdd426a4f..053e22dec8 100644 --- a/test/vector.cpp +++ b/test/vector.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/vector3.cpp b/test/vector3.cpp index e60a3f201f..9f2ea8f525 100644 --- a/test/vector3.cpp +++ b/test/vector3.cpp @@ -1,7 +1,7 @@ #include #include -#include "matrix.hpp" +#include using namespace matrix; diff --git a/test/vectorAssignment.cpp b/test/vectorAssignment.cpp index 86b3571f8e..8a72b29a38 100644 --- a/test/vectorAssignment.cpp +++ b/test/vectorAssignment.cpp @@ -1,6 +1,6 @@ #include -#include "matrix.hpp" +#include using namespace matrix;