about summary refs log tree commit diff
path: root/src/base
diff options
context:
space:
mode:
authorDennis Felsing <dennis.felsing@sap.com>2017-06-22 09:47:18 +0200
committerDennis Felsing <dennis.felsing@sap.com>2017-06-22 09:47:18 +0200
commitfc6d8b4d154049e6e3d6df9039669580f8ff747c (patch)
tree5e64f811b7c3076126ea6772cbe3cc572b17b773 /src/base
parentc1eed6e1776f48409e9d7372948e2c941dcad459 (diff)
downloadzcatch-fc6d8b4d154049e6e3d6df9039669580f8ff747c.tar.gz
zcatch-fc6d8b4d154049e6e3d6df9039669580f8ff747c.zip
Use round_to_int because of collision with std::round
Diffstat (limited to 'src/base')
-rw-r--r--src/base/math.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/base/math.h b/src/base/math.h
index 1728870b..73e2fc98 100644
--- a/src/base/math.h
+++ b/src/base/math.h
@@ -20,7 +20,7 @@ inline float sign(float f)
 	return f<0.0f?-1.0f:1.0f;
 }
 
-inline int round(float f)
+inline int round_to_int(float f)
 {
 	if(f > 0)
 		return (int)(f+0.5f);