Deprecated defs.hpp in favour of autodetect.hpp or generic.hpp

paoloambrosio · Mar 13, 2016 · cae0f25 · cae0f25
1 parent 22c427a
commit cae0f25
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/include/cucumber-cpp/autodetect.hpp b/include/cucumber-cpp/autodetect.hpp
@@ -1,4 +1,4 @@
 #include "internal/defs.hpp"
 #ifndef STEP_INHERITANCE
-    #error No test framework found: please include a testing framework before autodetect.hpp or include defs.hpp
+    #error No test framework found: please include a testing framework before autodetect.hpp or include generic.hpp
 #endif
diff --git a/include/cucumber-cpp/defs.hpp b/include/cucumber-cpp/defs.hpp
@@ -1,3 +1,4 @@
+#warning Use of defs.hpp is deprecated, please use either autodetect.hpp or generic.hpp
 #include "internal/defs.hpp"
 #ifndef STEP_INHERITANCE
     #include "internal/drivers/GenericDriver.hpp"

diff --git a/include/cucumber-cpp/generic.hpp b/include/cucumber-cpp/generic.hpp
@@ -0,0 +1,6 @@
+#include "internal/defs.hpp"
+#ifdef STEP_INHERITANCE
+    #error Test framework found: please include autodetect.hpp or remove the test framework includes
+#else
+    #include "internal/drivers/GenericDriver.hpp"
+#endif
diff --git a/tests/integration/drivers/GenericDriverTest.cpp b/tests/integration/drivers/GenericDriverTest.cpp
@@ -1,4 +1,4 @@
-#include <cucumber-cpp/defs.hpp>
+#include <cucumber-cpp/generic.hpp>
 
 #include "../../utils/DriverTestRunner.hpp"