8000 Fixed the continuous integration · joglosemarduino/ArduinoJson@e53ae0f · GitHub
[go: up one dir, main page]

Skip to content

Commit e53ae0f

Browse files
committed
Fixed the continuous integration
1 parent afdd913 commit e53ae0f

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

test/Misc/conflicts.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
// Copyright Benoit Blanchon 2014-2019
33
// MIT License
44

5+
// Include any header that might use the conflicting macros
6+
#include <cmath>
7+
#include <string>
8+
#include <iostream>
9+
510
// All cores
611
#define bit()
712
#define constrain()

0 commit comments

Comments
 (0)
0