Merge pull request #983 from CvH/openmpt

libopenmpt: fix leftover from version bump
This commit is contained in:
Lukas Rusak 2016-11-24 09:45:17 -08:00 committed by GitHub
commit 488d1c2768

View File

@ -1,14 +0,0 @@
Index: soundlib/tuning.cpp
===================================================================
--- a/soundlib/tuning.cpp (revision 6294)
+++ b/soundlib/tuning.cpp (working copy)
@@ -375,7 +375,8 @@
if(!IsOfType(TT_GROUPGEOMETRIC)) return 0;
if(note >= 0) return note % GetGroupSize();
- else return (GetGroupSize() - (abs(note) % GetGroupSize())) % GetGroupSize();
+ // static_cast<int>(note) because g++-6 template-disables std::abs overloads for 8bit and 16bit integer types via std::enable_if.
+ else return (GetGroupSize() - (std::abs(static_cast<int>(note)) % GetGroupSize())) % GetGroupSize();
}