esigra 2010-04-17 03:53:57 PDT
authorSam Lantinga <slouken@libsdl.org>
Fri, 23 Apr 2010 02:15:05 -0700
changeset 4439ab63fdcf66af
parent 4437 25e45611fa3d
child 4441 e3033ab628a1
esigra 2010-04-17 03:53:57 PDT

If this header file is supposed to be includable from C++ code, the code should
of course use one of the SDL_*_cast macros from SDL_stdinc.h.
include/SDL_endian.h
     1.1 --- a/include/SDL_endian.h	Tue Apr 20 07:16:42 2010 -0700
     1.2 +++ b/include/SDL_endian.h	Fri Apr 23 02:15:05 2010 -0700
     1.3 @@ -103,7 +103,7 @@
     1.4  static __inline__ Uint16
     1.5  SDL_Swap16(Uint16 x)
     1.6  {
     1.7 -    return (Uint16)((x << 8) | (x >> 8));
     1.8 +    return SDL_static_cast(Uint16, ((x << 8) | (x >> 8)));
     1.9  }
    1.10  #endif
    1.11  
    1.12 @@ -143,8 +143,8 @@
    1.13  static __inline__ Uint32
    1.14  SDL_Swap32(Uint32 x)
    1.15  {
    1.16 -    return (Uint32)((x << 24) | ((x << 8) & 0x00FF0000) |
    1.17 -                    ((x >> 8) & 0x0000FF00) | (x >> 24));
    1.18 +    return SDL_static_cast(Uint32, ((x << 24) | ((x << 8) & 0x00FF0000) |
    1.19 +                                    ((x >> 8) & 0x0000FF00) | (x >> 24)));
    1.20  }
    1.21  #endif
    1.22