mirror of
				https://github.com/catchorg/Catch2.git
				synced 2025-10-31 12:17:11 +01:00 
			
		
		
		
	Add disabling the use of Android's logging at compile time
This is done via the new compile time toggle, `CATCH_CONFIG_ANDROID_LOGWRITE`. Closes #1743
This commit is contained in:
		| @@ -94,6 +94,7 @@ | ||||
| // Android somehow still does not support std::to_string | ||||
| #if defined(__ANDROID__) | ||||
| #    define CATCH_INTERNAL_CONFIG_NO_CPP11_TO_STRING | ||||
| #    define CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE | ||||
| #endif | ||||
|  | ||||
| //////////////////////////////////////////////////////////////////////////////// | ||||
| @@ -115,7 +116,7 @@ | ||||
| // Required for some versions of Cygwin to declare gettimeofday | ||||
| // see: http://stackoverflow.com/questions/36901803/gettimeofday-not-declared-in-this-scope-cygwin | ||||
| #   define _BSD_SOURCE | ||||
| // some versions of cygwin (most) do not support std::to_string. Use the libstd check.  | ||||
| // some versions of cygwin (most) do not support std::to_string. Use the libstd check. | ||||
| // https://gcc.gnu.org/onlinedocs/gcc-4.8.2/libstdc++/api/a01053_source.html line 2812-2813 | ||||
| # if !((__cplusplus >= 201103L) && defined(_GLIBCXX_USE_C99) \ | ||||
|            && !defined(_GLIBCXX_HAVE_BROKEN_VSWPRINTF)) | ||||
| @@ -301,6 +302,10 @@ | ||||
| #  define CATCH_CONFIG_USE_ASYNC | ||||
| #endif | ||||
|  | ||||
| #if defined(CATCH_INTERNAL_CONFIG_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_NO_ANDROID_LOGWRITE) && !defined(CATCH_CONFIG_ANDROID_LOGWRITE) | ||||
| #  define CATCH_CONFIG_ANDROID_LOGWRITE | ||||
| #endif | ||||
|  | ||||
| #if !defined(CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS) | ||||
| #   define CATCH_INTERNAL_SUPPRESS_PARENTHESES_WARNINGS | ||||
| #   define CATCH_INTERNAL_UNSUPPRESS_PARENTHESES_WARNINGS | ||||
|   | ||||
| @@ -7,11 +7,12 @@ | ||||
|  */ | ||||
|  | ||||
| #include "catch_debug_console.h" | ||||
| #include "catch_compiler_capabilities.h" | ||||
| #include "catch_stream.h" | ||||
| #include "catch_platform.h" | ||||
| #include "catch_windows_h_proxy.h" | ||||
|  | ||||
| #if defined(__ANDROID__) | ||||
| #if defined(CATCH_CONFIG_ANDROID_LOGWRITE) | ||||
| #include <android/log.h> | ||||
|  | ||||
|     namespace Catch { | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 Martin Hořeňovský
					Martin Hořeňovský