diff options
| author | jacob1 <jfu614@gmail.com> | 2012-11-16 01:23:38 (GMT) |
|---|---|---|
| committer | jacob1 <jfu614@gmail.com> | 2012-11-16 01:23:38 (GMT) |
| commit | 1e32c545d9ca7f960cdd6f77714c7b2761880478 (patch) | |
| tree | 9800e5dbadcc53ed8f2c60762eb8b1abc88cb59f /src/simulation/elements/WOOD.cpp | |
| parent | bf3d7e9ad76a9c06c2f7f5771311dc8ea481dd96 (diff) | |
| download | powder-1e32c545d9ca7f960cdd6f77714c7b2761880478.zip powder-1e32c545d9ca7f960cdd6f77714c7b2761880478.tar.gz | |
fix visual studio std::max problem
Diffstat (limited to 'src/simulation/elements/WOOD.cpp')
| -rw-r--r-- | src/simulation/elements/WOOD.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/simulation/elements/WOOD.cpp b/src/simulation/elements/WOOD.cpp index cbbab8f..134d827 100644 --- a/src/simulation/elements/WOOD.cpp +++ b/src/simulation/elements/WOOD.cpp @@ -49,7 +49,7 @@ Element_WOOD::Element_WOOD() //#TPT-Directive ElementHeader Element_WOOD static int graphics(GRAPHICS_FUNC_ARGS) int Element_WOOD::graphics(GRAPHICS_FUNC_ARGS) { - float maxtemp = fmax(cpart->tmp, cpart->temp); + float maxtemp = std::max((float)cpart->tmp, cpart->temp); if (maxtemp > 400) { *colr -= (int)restrict_flt((maxtemp-400)/3,0,172); |