Merge remote-tracking branch 'origin/master'

diff --git a/gtest_sdl_main.cpp b/gtest_sdl_main.cpp
index 8a2fa9eafa5eca6ac2fe044932dabc3c74f94602..fa3a835cda7f167e00b199535a68d28ae23ec0f2 100644 (file)
--- a/gtest_sdl_main.cpp
+++ b/gtest_sdl_main.cpp
@@ -1,3 +1,5 @@
+#define GTEST_HAS_EXCEPTIONS 0
+
 #include <SDL/SDL.h>
 #include "gtest/gtest.h"