fixed compilation error in absense of eigen3

shogun-toolbox · Jul 25, 2013 · 2f15df7 · 2f15df7
1 parent 308f52a
commit 2f15df7
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 34 deletions.
diff --git a/src/shogun/mathematics/logdet/IterativeLinearSolver.cpp b/src/shogun/mathematics/logdet/IterativeLinearSolver.cpp
@@ -8,9 +8,6 @@
  */
 
 #include <shogun/lib/common.h>
-
-#ifdef HAVE_EIGEN3
-
 #include <shogun/base/Parameter.h>
 #include <shogun/mathematics/logdet/IterativeLinearSolver.h>
 
@@ -49,20 +46,6 @@ CIterativeLinearSolver<T, ST>::~CIterativeLinearSolver()
 		SG_SGCDEBUG("%s destroyed (%p)\n", this->get_name(), this);
 	}
 
-template class CIterativeLinearSolver<bool>;
-template class CIterativeLinearSolver<char>;
-template class CIterativeLinearSolver<int8_t>;
-template class CIterativeLinearSolver<uint8_t>;
-template class CIterativeLinearSolver<int16_t>;
-template class CIterativeLinearSolver<uint16_t>;
-template class CIterativeLinearSolver<int32_t>;
-template class CIterativeLinearSolver<uint32_t>;
-template class CIterativeLinearSolver<int64_t>;
-template class CIterativeLinearSolver<uint64_t>;
-template class CIterativeLinearSolver<float32_t>;
 template class CIterativeLinearSolver<float64_t>;
-template class CIterativeLinearSolver<floatmax_t>;
-template class CIterativeLinearSolver<complex64_t>;
 template class CIterativeLinearSolver<complex64_t, float64_t>;
 }
-#endif // HAVE_EIGEN3
diff --git a/src/shogun/mathematics/logdet/IterativeLinearSolver.h b/src/shogun/mathematics/logdet/IterativeLinearSolver.h
@@ -11,8 +11,6 @@
 #define ITERATIVE_LINEAR_SOLVER_H_
 
 #include <shogun/lib/config.h>
-
-#ifdef HAVE_EIGEN3
 #include <shogun/mathematics/logdet/LinearSolver.h>
 
 namespace shogun
@@ -102,5 +100,4 @@ template<class T, class ST=T> class CIterativeLinearSolver : public CLinearSolve
 
 }
 
-#endif // HAVE_EIGEN3
 #endif // ITERATIVE_LINEAR_SOLVER_H_
diff --git a/src/shogun/mathematics/logdet/IterativeShiftedLinearFamilySolver.cpp b/src/shogun/mathematics/logdet/IterativeShiftedLinearFamilySolver.cpp
@@ -90,6 +90,6 @@ void CIterativeShiftedLinearFamilySolver<T, ST>::compute_alpha_sh(
 	  }
 	}
 
-template class CIterativeShiftedLinearFamilySolver<float64_t, float64_t>;
+template class CIterativeShiftedLinearFamilySolver<float64_t>;
 template class CIterativeShiftedLinearFamilySolver<float64_t, complex64_t>;
 }
diff --git a/src/shogun/mathematics/logdet/IterativeShiftedLinearFamilySolver.h b/src/shogun/mathematics/logdet/IterativeShiftedLinearFamilySolver.h
@@ -31,7 +31,7 @@ template <class T, class ST> class CLinearOperator;
  * Reference: Beat Jegerlehner, Krylov space solvers for shifted linear
  * systems, 1996.
  */
-template<class T, class ST> class CIterativeShiftedLinearFamilySolver : public CIterativeLinearSolver<T, T>
+template<class T, class ST=T> class CIterativeShiftedLinearFamilySolver : public CIterativeLinearSolver<T, T>
 {
 
 public:

diff --git a/src/shogun/mathematics/logdet/LinearSolver.h b/src/shogun/mathematics/logdet/LinearSolver.h
@@ -54,19 +54,7 @@ template<class T, class ST=T> class CLinearSolver : public CSGObject
 
 };
 
-template class CLinearSolver<bool>;
-template class CLinearSolver<char>;
-template class CLinearSolver<int8_t>;
-template class CLinearSolver<uint8_t>;
-template class CLinearSolver<int16_t>;
-template class CLinearSolver<uint16_t>;
-template class CLinearSolver<int32_t>;
-template class CLinearSolver<uint32_t>;
-template class CLinearSolver<int64_t>;
-template class CLinearSolver<uint64_t>;
-template class CLinearSolver<float32_t>;
 template class CLinearSolver<float64_t>;
-template class CLinearSolver<floatmax_t>;
 template class CLinearSolver<complex64_t>;
 template class CLinearSolver<complex64_t, float64_t>;