mirror of
				https://github.com/eledio-devices/thirdparty-ArduinoJson.git
				synced 2025-10-31 08:42:39 +01:00 
			
		
		
		
	Suppress IAR compiler warning.
This commit is contained in:
		
				
					committed by
					
						 Benoit Blanchon
						Benoit Blanchon
					
				
			
			
				
	
			
			
			
						parent
						
							144ff3b06e
						
					
				
				
					commit
					0c0bf80074
				
			| @@ -9,6 +9,7 @@ HEAD | ||||
| * Fixed `copyArray()` not working with `String`, `ElementProxy`, and `MemberProxy` | ||||
| * Fixed error `getOrAddElement is not a member of ElementProxy` (issue #1311) | ||||
| * Fixed excessive stack usage when compiled with `-Og` (issues #1210 and #1314) | ||||
| * Fixed `Warning[Pa093]: implicit conversion from floating point to integer` on IAR compiler (PR #1328 by @stawiski) | ||||
|  | ||||
| v6.15.2 (2020-05-15) | ||||
| ------- | ||||
|   | ||||
| @@ -12,6 +12,11 @@ | ||||
| #pragma warning(disable : 4244) | ||||
| #endif | ||||
|  | ||||
| #ifdef __ICCARM__ | ||||
| // Suppress IAR Compiler Warning[Pa093]: implicit conversion from floating point to integer | ||||
| #pragma diag_suppress=Pa093 | ||||
| #endif | ||||
|  | ||||
| namespace ARDUINOJSON_NAMESPACE { | ||||
|  | ||||
| template <typename From, typename To> | ||||
| @@ -32,3 +37,7 @@ struct is_convertible { | ||||
| #ifdef _MSC_VER | ||||
| #pragma warning(pop) | ||||
| #endif | ||||
|  | ||||
| #ifdef __ICCARM__ | ||||
| #pragma diag_default=Pa093 | ||||
| #endif | ||||
|   | ||||
		Reference in New Issue
	
	Block a user