mirror of https://github.com/odrling/Aegisub
very minor changes to utils.h
Originally committed to SVN as r993.
This commit is contained in:
parent
e72b0ae8c0
commit
28504a5c9b
|
@ -75,7 +75,7 @@ int SmallestPowerOf2(int x);
|
||||||
#ifdef __VISUALC__
|
#ifdef __VISUALC__
|
||||||
#define FORCEINLINE __forceinline
|
#define FORCEINLINE __forceinline
|
||||||
#else
|
#else
|
||||||
#define FORCEINLINE inline
|
#define FORCEINLINE inline // __attribute__((always_inline)) gives me errors on g++ ~amz
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -92,7 +92,7 @@ static inline void IntSwap(int &a,int &b) {
|
||||||
//////////////////////////
|
//////////////////////////
|
||||||
// Clamp integer to range
|
// Clamp integer to range
|
||||||
// Code taken from http://bob.allegronetwork.com/prog/tricks.html#clamp
|
// Code taken from http://bob.allegronetwork.com/prog/tricks.html#clamp
|
||||||
FORCEINLINE static int ClampSignedInteger32(int x,int min,int max) {
|
static FORCEINLINE int ClampSignedInteger32(int x,int min,int max) {
|
||||||
x -= min;
|
x -= min;
|
||||||
x &= (~x) >> 31;
|
x &= (~x) >> 31;
|
||||||
x += min;
|
x += min;
|
||||||
|
|
Loading…
Reference in New Issue