diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-12-21 20:16:36 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-12-21 20:16:36 +0300 |
| commit | 80f7177ea4ce0185e1ef3355e91dcf14617d0f09 (patch) | |
| tree | 78e8453d25645b85f2610a504b4a248acee5fb9c /src/utils/sdlcheckutils.cpp | |
| parent | c5327f3b1d10171ff2a97546ea49e350b1725c24 (diff) | |
| parent | 0dd6ab2bfdee4527ca0960b4e7a64e257bb93fa3 (diff) | |
| download | plus-80f7177ea4ce0185e1ef3355e91dcf14617d0f09.tar.gz plus-80f7177ea4ce0185e1ef3355e91dcf14617d0f09.tar.bz2 plus-80f7177ea4ce0185e1ef3355e91dcf14617d0f09.tar.xz plus-80f7177ea4ce0185e1ef3355e91dcf14617d0f09.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/utils/sdlcheckutils.cpp')
| -rw-r--r-- | src/utils/sdlcheckutils.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/utils/sdlcheckutils.cpp b/src/utils/sdlcheckutils.cpp index 7140e44fe..a3524aa91 100644 --- a/src/utils/sdlcheckutils.cpp +++ b/src/utils/sdlcheckutils.cpp @@ -54,9 +54,9 @@ struct MemoryObject std::map<void*, MemoryObject*> mSurfaces; -static SDL_Surface *addSurface(const char *const name, - SDL_Surface *const surface, - const char *const file, +static SDL_Surface *addSurface(const char *restrict const name, + SDL_Surface *restrict const surface, + const char *restrict const file, const unsigned line) { #ifdef DEBUG_SURFACE_ALLOCATION @@ -85,9 +85,9 @@ static SDL_Surface *addSurface(const char *const name, return surface; } -static void deleteSurface(const char *const name A_UNUSED, - SDL_Surface *const surface, - const char *const file, +static void deleteSurface(const char *restrict const name A_UNUSED, + SDL_Surface *restrict const surface, + const char *restrict const file, const unsigned line) { #ifdef DEBUG_SURFACE_ALLOCATION @@ -159,7 +159,8 @@ void FakeSDL_FreeSurface(SDL_Surface *const surface, const char *const file, SDL_Surface *FakeSDL_CreateRGBSurface(const uint32_t flags, const int width, const int height, - const int depth, const uint32_t rMask, + const int depth, + const uint32_t rMask, const uint32_t gMask, const uint32_t bMask, const uint32_t aMask, @@ -181,9 +182,9 @@ SDL_Surface *FakeSDL_ConvertSurface(SDL_Surface *const src, } SDL_Surface *FakeTTF_RenderUTF8_Blended(_TTF_Font *const font, - const char *const text, + const char *restrict const text, const SDL_Color &fg, - const char *const file, + const char *restrict const file, const unsigned line) { return addSurface("TTF_RenderUTF8_Blended", TTF_RenderUTF8_Blended( |