Changeset b40b987 for launchers/macosx/include/subprocess.hpp

Timestamp:

Sep 30, 2018 9:32:49 AM (2 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

ae0d420

Parents:

e8d371e

Message:

Mac OSX Launcher:

• Fixed issue with >> and compilers in C++ in subprocess.hpp
• Added queue for logger
• Misc

File:

• launchers/macosx/include/subprocess.hpp (modified) (4 diffs)

launchers/macosx/include/subprocess.hpp

@@ -35 +35 @@
 #define SUBPROCESS_HPP
 
+#ifdef __cplusplus
+
 #include <map>
 #include <algorithm>
@@ -698 +700 @@
 
 template <typename F>
-struct has_type<F, param_pack<>> {
+struct has_type<F, param_pack<> > {
   static constexpr bool value = false;
 };
 
 template <typename F, typename... T>
-struct has_type<F, param_pack<F, T...>> {
+struct has_type<F, param_pack<F, T...> > {
   static constexpr bool value = true;
 };
 
 template <typename F, typename H, typename... T>
-struct has_type<F, param_pack<H,T...>> {
+struct has_type<F, param_pack<H,T...> > {
   static constexpr bool value =
-    std::is_same<F, typename std::decay<H>::type>::value ? true : has_type<F, param_pack<T...>>::value;
+    std::is_same<F, typename std::decay<H>::type>::value ? true : has_type<F, param_pack<T...> >::value;
 };
 
@@ -1529 +1531 @@
   OutBuffer check_output_impl(F& farg, Args&&... args)
   {
-    static_assert(!detail::has_type<output, detail::param_pack<Args...>>::value, "output not allowed in args");
+    static_assert(!detail::has_type<output, detail::param_pack<Args...> >::value, "output not allowed in args");
     auto p = Popen(std::forward<F>(farg), std::forward<Args>(args)..., output{PIPE});
     auto res = p.communicate();
@@ -1628 +1630 @@
 };
 
+#endif // __cplusplus
+
 #endif // SUBPROCESS_HPP