[Scummvm-cvs-logs] scummvm master -> 2f9b7ba686c8ba763395fbc876a892cc9ea01fd4

lordhoto lordhoto at gmail.com
Tue Jul 30 21:03:26 CEST 2013


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2f9b7ba686 COMMON: Enforce formatting guidelines a bit more in util.h.


Commit: 2f9b7ba686c8ba763395fbc876a892cc9ea01fd4
    https://github.com/scummvm/scummvm/commit/2f9b7ba686c8ba763395fbc876a892cc9ea01fd4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-07-30T12:02:01-07:00

Commit Message:
COMMON: Enforce formatting guidelines a bit more in util.h.

Changed paths:
    common/util.h



diff --git a/common/util.h b/common/util.h
index 4ca1c42..392ced1 100644
--- a/common/util.h
+++ b/common/util.h
@@ -41,10 +41,10 @@
 #undef MAX
 #endif
 
-template<typename T> inline T ABS (T x)			{ return (x>=0) ? x : -x; }
-template<typename T> inline T MIN (T a, T b)	{ return (a<b) ? a : b; }
-template<typename T> inline T MAX (T a, T b)	{ return (a>b) ? a : b; }
-template<typename T> inline T CLIP (T v, T amin, T amax)
+template<typename T> inline T ABS(T x)		{ return (x >= 0) ? x : -x; }
+template<typename T> inline T MIN(T a, T b)	{ return (a < b) ? a : b; }
+template<typename T> inline T MAX(T a, T b)	{ return (a > b) ? a : b; }
+template<typename T> inline T CLIP(T v, T amin, T amax)
 		{ if (v < amin) return amin; else if (v > amax) return amax; else return v; }
 
 /**






More information about the Scummvm-git-logs mailing list