Răsfoiți Sursa

changed template include for win32 target

Johannes R 12 ani în urmă
părinte
comite
e4793eab82

+ 2 - 2
core/basics/vectorio.h

@@ -60,8 +60,8 @@ void readVectorOfPointers ( std::istream& input, std::vector<T*>& v );
 
 } // namespace
 
-#ifdef __GNUC__
+//#ifdef __GNUC__
 #include "core/basics/vectorio.tcc"
-#endif
+//#endif
 
 #endif //_VECTORIO_H_

+ 2 - 2
core/vector/Algorithms.h

@@ -256,8 +256,8 @@ inline double absoluteAngleBetweenVectorsIgnoringDirection(
 
 } // namespace
 
-#ifdef __GNUC__
+//#ifdef __GNUC__
   #include <core/vector/Algorithms.tcc>
-#endif
+//#endif
 
 #endif // ALGORITHMS_H

+ 2 - 2
core/vector/Distance.h

@@ -254,8 +254,8 @@ protected:
 
 } // namespace NICE
 
-#ifdef __GNUC__
+//#ifdef __GNUC__
     #include <core/vector/Distance.tcc>
-#endif
+//#endif
 
 #endif // __VECTOR_DISTANCE_H__

+ 2 - 2
core/vector/MatrixT.h

@@ -741,9 +741,9 @@ void blockwiseMultiplication ( const MatrixT<T> & A, uint blockSize, const Vecto
 
 }
 
-#ifdef __GNUC__
+//#ifdef __GNUC__
 #include "core/vector/MatrixT.tcc"
-#endif
+//#endif
 
 #endif // _EMATRIX_BASICVECTOR_H
 

+ 2 - 2
core/vector/RowMatrixT.h

@@ -511,9 +511,9 @@ typedef RowMatrixT<double> DoubleRowMatrix;
 typedef RowMatrixT<char>  CharRowMatrix;
 }
 
-#ifdef __GNUC__
+//#ifdef __GNUC__
 #include "core/vector/RowMatrixT.tcc"
-#endif
+//#endif
 
 #endif // _EROWMATRIX_BASICVECTOR_H
 

+ 1 - 1
core/vector/SVD.h

@@ -119,7 +119,7 @@ inline void enforceRankDefect(MatrixT<T>& m, const uint defect) {
 
 #else // no LinAl
 #ifndef SVDLINAL_WARNING
-#warning SVD requires LinAl.
+#pragma message WARNING("SVD requires LinAl.")
 #define SVDLINAL_WARNING
 #endif
 #endif

+ 2 - 2
core/vector/VectorT.h

@@ -953,8 +953,8 @@ inline VectorT<Tp> operator* ( double s, const VectorT<Tp> & x )
 #include "core/vector/MatrixT.h"
 #include "core/vector/RowMatrixT.h"
 
-#ifdef __GNUC__
+//#ifdef __GNUC__
 #include "core/vector/VectorT.tcc"
-#endif
+//#endif
 
 #endif // _EVECTOR_BASICVECTOR_H