mirrors/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy synced 2025-04-30 04:43:53 +00:00
Code Issues Releases Wiki Activity

Merged in rokups/tracy/fix-unix-build (pull request #15)

Browse Source 
Fix build errors with some compilers due to using std::max(float, double).
This commit is contained in:
Rokas Kupstys 2018-07-17 14:21:20 +00:00 committed by Bartosz Taudul
commit ab8d2c553a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/TracyView.cpp
View File

@ -4035,7 +4035,7 @@ void View::DrawFindZone()
{ {
const auto pxns = numBins / dt; const auto pxns = numBins / dt;
const auto nspx = 1.0 / pxns; const auto nspx = 1.0 / pxns;
const auto scale = std::max( 0.0f, round( log10fast( nspx ) + 2 ) ); const auto scale = std::max<float>( 0.0f, round( log10fast( nspx ) + 2 ) );
const auto step = pow( 10, scale ); const auto step = pow( 10, scale );
const auto dx = step * pxns; const auto dx = step * pxns;
@ -4838,7 +4838,7 @@ void View::DrawCompare()
{ {
const auto pxns = numBins / dt; const auto pxns = numBins / dt;
const auto nspx = 1.0 / pxns; const auto nspx = 1.0 / pxns;
const auto scale = std::max( 0.0f, round( log10fast( nspx ) + 2 ) ); const auto scale = std::max<float>( 0.0f, round( log10fast( nspx ) + 2 ) );
const auto step = pow( 10, scale ); const auto step = pow( 10, scale );
const auto dx = step * pxns; const auto dx = step * pxns;