going back go c++14

Author: frameworklabs

examples_cpp/Makefile

@@ -2,7 +2,7 @@ run: demo
 	./demo 
 
 demo: demo.cpp ../include/proto_activities.h
-	c++ --std c++17 -I ../include demo.cpp -o demo
+	c++ --std c++14 -I ../include demo.cpp -o demo
 
 clean:
 	rm demo

include/proto_activities.h

@@ -59,10 +59,11 @@ extern __thread pa_time_t pa_current_time_ms;
 #define _pa_extern
 #define _pa_has_field_definer(field) \
     namespace proto_activities { \
+        template< class... > using void_t = void; \
         template <typename T, typename = void> \
         struct has_field_##field : std::false_type {}; \
         template <typename T> \
-        struct has_field_##field<T, std::void_t<decltype(std::declval<T>().field)>> : std::true_type {}; \
+        struct has_field_##field<T, void_t<decltype(std::declval<T>().field)>> : std::true_type {}; \
     }
 #define _pa_has_field(ty, field) proto_activities::has_field_##field<ty>::value
 #endif
@@ -452,10 +453,8 @@ namespace proto_activities {
     template <typename T>
     auto invoke_resume(T* frame) -> typename std::enable_if<!_pa_has_field(T, _pa_susres)>::type {}
 }
-#define _pa_susres_suspend(ty, alias) \
-    if constexpr (_pa_has_field(ty, _pa_susres)) { proto_activities::invoke_suspend<ty>(_pa_inst_ptr(alias)); }
-#define _pa_susres_resume(ty, alias) \
-    if constexpr (_pa_has_field(ty, _pa_susres)) { proto_activities::invoke_resume<ty>(_pa_inst_ptr(alias)); }
+#define _pa_susres_suspend(ty, alias) proto_activities::invoke_suspend<ty>(_pa_inst_ptr(alias));
+#define _pa_susres_resume(ty, alias) proto_activities::invoke_resume<ty>(_pa_inst_ptr(alias));
 
 #define pa_susres_res proto_activities::SusRes _pa_susres{};
 #define pa_suspend pa_self._pa_susres.sus_thunk = [&]()
@@ -470,8 +469,7 @@ namespace proto_activities {
     template <typename T>
     auto invoke_enter(T& frame) -> typename std::enable_if<!_pa_has_field(T, _pa_enter)>::type {}
 }
-#define _pa_enter_invoke(ty) \
-    if constexpr (_pa_has_field(ty, _pa_enter)) { proto_activities::invoke_enter<ty>(pa_self); }
+#define _pa_enter_invoke(ty) proto_activities::invoke_enter<ty>(pa_self);
 
 #define pa_enter_res proto_activities::Enter _pa_enter{};
 #define pa_enter pa_self._pa_enter = [&]()

tests_cpp/Makefile

@@ -2,7 +2,7 @@ run: tests
 	./tests
 
 tests: tests.cpp ../include/proto_activities.h
-	c++ --std c++17 -I ../include tests.cpp -o tests
+	c++ --std c++14 -I ../include tests.cpp -o tests
 
 clean:
 	rm tests