feedc0de/ArduinoJson
1
0
Fork 0
forked from bblanchon/ArduinoJson
Code Pull Requests Activity

Fixed the continuous integration

Browse Source
This commit is contained in:
Benoit Blanchon
2019-03-04 12:18:01 +01:00
parent afdd913a2f
commit e53ae0f9bb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/Misc/conflicts.cpp
View File

@ -2,6 +2,11 @@
// Copyright Benoit Blanchon 2014-2019 // Copyright Benoit Blanchon 2014-2019
// MIT License // MIT License
// Include any header that might use the conflicting macros
#include <cmath>
#include <string>
#include <iostream>
// All cores // All cores
#define bit() #define bit()
#define constrain() #define constrain()