Przeglądaj źródła

fixed core/vector for win32 build

Johannes R 12 lat temu
rodzic
commit
3ec0f98789
2 zmienionych plików z 3 dodań i 3 usunięć
  1. 1 1
      core/vector/Algorithms.cpp
  2. 2 2
      core/vector/Distance.cpp

+ 1 - 1
core/vector/Algorithms.cpp

@@ -61,7 +61,7 @@ void choleskyDecompLargeScale ( const Matrix & A, Matrix & G, bool resetUpperTri
 				G(i,j) = 0;
 				G(i,j) = 0;
 #else
 #else
   #ifndef CHOLESKYLINAL_WARNING
   #ifndef CHOLESKYLINAL_WARNING
-	#warning "LinAl is not installed: choleskyDecompLargeScale will not be optimized."  
+	#pragma message WARNING("LinAl is not installed: choleskyDecompLargeScale will not be optimized.")
   #define CHOLESKYLINAL_WARNING
   #define CHOLESKYLINAL_WARNING
   #endif
   #endif
 	choleskyDecomp ( A, G, resetUpperTriangle );
 	choleskyDecomp ( A, G, resetUpperTriangle );

+ 2 - 2
core/vector/Distance.cpp

@@ -7,7 +7,7 @@ template<>
 Ipp32f EuclidianDistance<Ipp32f>::doCalculate(const VectorT<Ipp32f>& v1, const VectorT<Ipp32f>& v2) const {
 Ipp32f EuclidianDistance<Ipp32f>::doCalculate(const VectorT<Ipp32f>& v1, const VectorT<Ipp32f>& v2) const {
 
 
     if(v1.size()!=v2.size())
     if(v1.size()!=v2.size())
-        _THROW_EVector("Input vectors must have the same size.");
+        fthrow(Exception, "Input vectors must have the same size.");
 
 
     Ipp32f dist = 0;
     Ipp32f dist = 0;
 
 
@@ -39,7 +39,7 @@ template<>
 Ipp32f BhattacharyyaDistance<Ipp32f>::doCalculate(const VectorT<Ipp32f>& v1, const VectorT<Ipp32f>& v2) const {
 Ipp32f BhattacharyyaDistance<Ipp32f>::doCalculate(const VectorT<Ipp32f>& v1, const VectorT<Ipp32f>& v2) const {
 
 
     if(v1.size()!=v2.size())
     if(v1.size()!=v2.size())
-        _THROW_EVector("Input vectors must have the same size.");
+        fthrow(Exception, "Input vectors must have the same size.");
 
 
     Ipp32f B;
     Ipp32f B;