Explorar el Código

Fixed build warnings on MSVC14 x64 in Target Animation source.

Jared Mulconry hace 8 años
padre
commit
39f54bf183
Se han modificado 1 ficheros con 2 adiciones y 2 borrados
  1. 2 2
      code/TargetAnimation.cpp

+ 2 - 2
code/TargetAnimation.cpp

@@ -100,8 +100,8 @@ void KeyIterator::operator ++()
     // to our current position on the time line
     double d0,d1;
 
-    d0 = objPos->at      ( std::min<unsigned int> ( nextObjPos, objPos->size()-1)             ).mTime;
-    d1 = targetObjPos->at( std::min<unsigned int> ( nextTargetObjPos, targetObjPos->size()-1) ).mTime;
+    d0 = objPos->at      ( std::min ( nextObjPos, static_cast<unsigned int>(objPos->size()-1))             ).mTime;
+    d1 = targetObjPos->at( std::min ( nextTargetObjPos, static_cast<unsigned int>(targetObjPos->size()-1)) ).mTime;
 
     // Easiest case - all are identical. In this
     // case we don't need to interpolate so we can