From e53ae0f9bb5e5c682efa6fc44b46794c6f57d0b1 Mon Sep 17 00:00:00 2001
From: Benoit Blanchon <github@benoitblanchon.fr>
Date: Mon, 4 Mar 2019 12:18:01 +0100
Subject: [PATCH] Fixed the continuous integration

---
 test/Misc/conflicts.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/test/Misc/conflicts.cpp b/test/Misc/conflicts.cpp
index fe91bdef..52f694d8 100644
--- 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()