Fixed the continuous integration

2019-03-04 12:18:01 +01:00
parent afdd913a2f
commit e53ae0f9bb
1 changed files with 5 additions and 0 deletions
--- a/test/Misc/conflicts.cpp
+++ b/test/Misc/conflicts.cpp
@ -2,6 +2,11 @@
 // Copyright Benoit Blanchon 2014-2019
 // MIT License

+// Include any header that might use the conflicting macros
+#include <cmath>
+#include <string>
+#include <iostream>
+
 // All cores
 #define bit()
 #define constrain()