From 0aede126fc0b2a89b42fb80354a71ebad293c866 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 11 Dec 2015 22:58:50 +0300 Subject: [PATCH] Fix main() signatures to be compatible with SDL_main --- examples/audio_sine.cc | 2 +- examples/audio_wav.cc | 2 +- examples/fill.cc | 2 +- examples/image.cc | 2 +- examples/lines.cc | 2 +- examples/mixer.cc | 2 +- examples/mixer_effects.cc | 2 +- examples/mixer_music.cc | 2 +- examples/mixer_music_sine.cc | 2 +- examples/rendertarget.cc | 2 +- examples/sprites.cc | 2 +- examples/ttf.cc | 2 +- tests/header_containerrwops.cc | 2 +- tests/header_streamrwops.cc | 2 +- tests/header_test.cc.in | 2 +- tests/live_mixer.cc | 2 +- tests/live_rendering.cc | 2 +- tests/test_error.cc | 2 +- tests/test_optional.cc | 2 +- tests/test_pointrect.cc | 2 +- tests/test_pointrect_constexpr.cc | 2 +- tests/test_rwops.cc | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/audio_sine.cc b/examples/audio_sine.cc index 4ef7909..7b95b4a 100644 --- a/examples/audio_sine.cc +++ b/examples/audio_sine.cc @@ -29,7 +29,7 @@ using namespace SDL2pp; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_AUDIO); const int samplerate = 48000; diff --git a/examples/audio_wav.cc b/examples/audio_wav.cc index fb8711d..b26cb6f 100644 --- a/examples/audio_wav.cc +++ b/examples/audio_wav.cc @@ -32,7 +32,7 @@ using namespace SDL2pp; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_AUDIO); Wav wav(TESTDATA_DIR "/test.wav"); diff --git a/examples/fill.cc b/examples/fill.cc index de0724e..6fc2b5f 100644 --- a/examples/fill.cc +++ b/examples/fill.cc @@ -75,7 +75,7 @@ static int Run() { return 0; } -int main() { +int main(int, char*[]) { try { return Run(); } catch (std::exception& e) { diff --git a/examples/image.cc b/examples/image.cc index 60aa217..8a0a0b5 100644 --- a/examples/image.cc +++ b/examples/image.cc @@ -36,7 +36,7 @@ using namespace SDL2pp; static const float pi = 3.14159265358979323846f; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_VIDEO); SDLImage image(IMG_INIT_PNG); // optional Window window("libSDL2pp demo: loading", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE); diff --git a/examples/lines.cc b/examples/lines.cc index 7d90102..ce0ed32 100644 --- a/examples/lines.cc +++ b/examples/lines.cc @@ -29,7 +29,7 @@ using namespace SDL2pp; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_VIDEO); Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE); Renderer render(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE); diff --git a/examples/mixer.cc b/examples/mixer.cc index c8ba66d..fcac379 100644 --- a/examples/mixer.cc +++ b/examples/mixer.cc @@ -31,7 +31,7 @@ using namespace SDL2pp; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_AUDIO); SDLMixer mixerlib(MIX_INIT_OGG); Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096); diff --git a/examples/mixer_effects.cc b/examples/mixer_effects.cc index 28286a9..b99a52c 100644 --- a/examples/mixer_effects.cc +++ b/examples/mixer_effects.cc @@ -31,7 +31,7 @@ using namespace SDL2pp; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_AUDIO); SDLMixer mixerlib(MIX_INIT_OGG); Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096); diff --git a/examples/mixer_music.cc b/examples/mixer_music.cc index e456e80..a61963a 100644 --- a/examples/mixer_music.cc +++ b/examples/mixer_music.cc @@ -31,7 +31,7 @@ using namespace SDL2pp; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_AUDIO); SDLMixer mixerlib(MIX_INIT_OGG); Mixer mixer(MIX_DEFAULT_FREQUENCY, MIX_DEFAULT_FORMAT, MIX_DEFAULT_CHANNELS, 4096); diff --git a/examples/mixer_music_sine.cc b/examples/mixer_music_sine.cc index f4d6618..f20982c 100644 --- a/examples/mixer_music_sine.cc +++ b/examples/mixer_music_sine.cc @@ -28,7 +28,7 @@ using namespace SDL2pp; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_AUDIO); Mixer mixer(MIX_DEFAULT_FREQUENCY, AUDIO_S16SYS, 1, 4096); diff --git a/examples/rendertarget.cc b/examples/rendertarget.cc index fc6d431..6bf1a1c 100644 --- a/examples/rendertarget.cc +++ b/examples/rendertarget.cc @@ -45,7 +45,7 @@ enum { MY_RENDERTARGET_SIZE = 512, }; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_VIDEO); Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, MY_SCREEN_WIDTH, MY_SCREEN_HEIGHT, SDL_WINDOW_RESIZABLE); Renderer render(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE); diff --git a/examples/sprites.cc b/examples/sprites.cc index 24f7304..e5ea6a5 100644 --- a/examples/sprites.cc +++ b/examples/sprites.cc @@ -38,7 +38,7 @@ static const unsigned char pixels[4 * 4 * 4] = { RGBA(0x80, 0x00, 0xff, 0xff), RGBA(0x00, 0x00, 0xff, 0xff), RGBA(0x00, 0x80, 0xff, 0xff), RGBA(0x00, 0xff, 0xff, 0xff), }; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_VIDEO); Window window("libSDL2pp demo: sprites", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE); Renderer render(window, -1, SDL_RENDERER_ACCELERATED); diff --git a/examples/ttf.cc b/examples/ttf.cc index ca457f6..06a0b57 100644 --- a/examples/ttf.cc +++ b/examples/ttf.cc @@ -33,7 +33,7 @@ using namespace SDL2pp; -int main() try { +int main(int, char*[]) try { SDL sdl(SDL_INIT_VIDEO); SDLTTF ttf; Window window("libSDL2pp demo: font", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE); diff --git a/tests/header_containerrwops.cc b/tests/header_containerrwops.cc index ea400b7..67a124e 100644 --- a/tests/header_containerrwops.cc +++ b/tests/header_containerrwops.cc @@ -1,5 +1,5 @@ #include -int main() { +int main(int, char*[]) { return 0; } diff --git a/tests/header_streamrwops.cc b/tests/header_streamrwops.cc index eb497fb..f4f3ee4 100644 --- a/tests/header_streamrwops.cc +++ b/tests/header_streamrwops.cc @@ -1,5 +1,5 @@ #include -int main() { +int main(int, char*[]) { return 0; } diff --git a/tests/header_test.cc.in b/tests/header_test.cc.in index 31e13e0..f998669 100644 --- a/tests/header_test.cc.in +++ b/tests/header_test.cc.in @@ -1,5 +1,5 @@ #include <@HEADER@> -int main() { +int main(int, char*[]) { return 0; } diff --git a/tests/live_mixer.cc b/tests/live_mixer.cc index 49bdf3a..4492579 100644 --- a/tests/live_mixer.cc +++ b/tests/live_mixer.cc @@ -7,7 +7,7 @@ using namespace SDL2pp; -BEGIN_TEST() +BEGIN_TEST(int, char*[]) SDL sdl(SDL_INIT_AUDIO); SDLMixer mixerlib; diff --git a/tests/live_rendering.cc b/tests/live_rendering.cc index dc5128f..4103e25 100644 --- a/tests/live_rendering.cc +++ b/tests/live_rendering.cc @@ -49,7 +49,7 @@ public: } }; -BEGIN_TEST() +BEGIN_TEST(int, char*[]) SDL sdl(SDL_INIT_VIDEO); Window window("libSDL2pp test", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 320, 240, 0); Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED); diff --git a/tests/test_error.cc b/tests/test_error.cc index 46d9dd5..6242f18 100644 --- a/tests/test_error.cc +++ b/tests/test_error.cc @@ -6,7 +6,7 @@ using namespace SDL2pp; -BEGIN_TEST() +BEGIN_TEST(int, char*[]) SDL_SetError("foo"); try { diff --git a/tests/test_optional.cc b/tests/test_optional.cc index 4b405ea..3a736ee 100644 --- a/tests/test_optional.cc +++ b/tests/test_optional.cc @@ -6,7 +6,7 @@ using namespace SDL2pp; -BEGIN_TEST() +BEGIN_TEST(int, char*[]) // Engage/disengage { Optional o; diff --git a/tests/test_pointrect.cc b/tests/test_pointrect.cc index 466b9aa..7c7a2bd 100644 --- a/tests/test_pointrect.cc +++ b/tests/test_pointrect.cc @@ -5,7 +5,7 @@ using namespace SDL2pp; -BEGIN_TEST() +BEGIN_TEST(int, char*[]) { // Point basic ops Point p(1,2); diff --git a/tests/test_pointrect_constexpr.cc b/tests/test_pointrect_constexpr.cc index d360555..c36c17a 100644 --- a/tests/test_pointrect_constexpr.cc +++ b/tests/test_pointrect_constexpr.cc @@ -5,7 +5,7 @@ using namespace SDL2pp; -BEGIN_TEST() +BEGIN_TEST(int, char*[]) // note that this is merely a compilation test; EXPECT_s are mainly // used to silence `unused variable' warnings { diff --git a/tests/test_rwops.cc b/tests/test_rwops.cc index e63e60a..3ece7c5 100644 --- a/tests/test_rwops.cc +++ b/tests/test_rwops.cc @@ -9,7 +9,7 @@ using namespace SDL2pp; -BEGIN_TEST() +BEGIN_TEST(int, char*[]) // First check our custom ContainerRWops, not touching // SDL-provided RWops services {