mirror of
				https://github.com/eledio-devices/thirdparty-ArduinoJson.git
				synced 2025-10-31 16:14:11 +01:00 
			
		
		
		
	Allow mixed configuration in compilation units (issue #809)
This commit is contained in:
		| @@ -11,8 +11,7 @@ | ||||
| #include "../Configuration.hpp" | ||||
| #include "../Polyfills/attributes.hpp" | ||||
|  | ||||
| namespace ArduinoJson { | ||||
| namespace Internals { | ||||
| namespace ARDUINOJSON_NAMESPACE { | ||||
| // Handle the memory management (done in derived classes) and calls the parser. | ||||
| // This abstract class is implemented by StaticMemoryPool which implements a | ||||
| // fixed memory allocation. | ||||
| @@ -38,5 +37,4 @@ class MemoryPool { | ||||
| #endif | ||||
|   } | ||||
| }; | ||||
| }  // namespace Internals | ||||
| }  // namespace ArduinoJson | ||||
| }  // namespace ARDUINOJSON_NAMESPACE | ||||
|   | ||||
		Reference in New Issue
	
	Block a user