Using stdlib index_sequence instead of arx

Author: cmaglie

src/rpclite_utils.h

@@ -189,9 +189,15 @@ deserialize_tuple(MsgPack::Unpacker& unpacker, std::tuple<Ts...>& out) {
     return deserialize_tuple<I + 1>(unpacker, out);
 }
 
+#ifdef ARDUINO_ARCH_ZEPHYR
+using std::index_sequence;
+#else
+using arx::stdx::index_sequence;
+#endif
+
 // Helper to invoke a function with a tuple of arguments
 template<typename F, typename Tuple, std::size_t... I>
-inline auto invoke_with_tuple(F&& f, Tuple&& t, arx::stdx::index_sequence<I...>)
+inline auto invoke_with_tuple(F&& f, Tuple&& t, index_sequence<I...>)
     -> decltype(f(std::get<I>(std::forward<Tuple>(t))...)) {
     return f(std::get<I>(std::forward<Tuple>(t))...);
 }

src/wrapper.h

@@ -30,6 +30,12 @@ class IFunctionWrapper {
     virtual bool operator()(MsgPack::Unpacker& unpacker, MsgPack::Packer& packer) = 0;
 };
 
+#ifdef ARDUINO_ARCH_ZEPHYR
+using std::make_index_sequence;
+#else
+using arx::stdx::make_index_sequence;
+#endif
+
 #ifdef ARDUINO_ARCH_ZEPHYR
 template<typename R, typename... Args>
 class RpcFunctionWrapper: public IFunctionWrapper {
@@ -100,7 +106,7 @@ class RpcFunctionWrapper<std::function<R(Args...)>>: public IFunctionWrapper {
         std::tuple<Args...> args;
         if (!deserialize_tuple(unpacker, args)) return false;
         MsgPack::object::nil_t nil;
-        invoke_with_tuple(_func, args, arx::stdx::make_index_sequence<sizeof...(Args)>{});
+        invoke_with_tuple(_func, args, make_index_sequence<sizeof...(Args)>{});
         packer.serialize(nil, nil);
         return true;
     }
@@ -112,7 +118,7 @@ class RpcFunctionWrapper<std::function<R(Args...)>>: public IFunctionWrapper {
         std::tuple<Args...> args;
         if (!deserialize_tuple(unpacker, args)) return false;
         MsgPack::object::nil_t nil;
-        R out = invoke_with_tuple(_func, args, arx::stdx::make_index_sequence<sizeof...(Args)>{});
+        R out = invoke_with_tuple(_func, args, make_index_sequence<sizeof...(Args)>{});
         packer.serialize(nil, out);
         return true;
     }