diff --git a/include/cubescript/cubescript.hh b/include/cubescript/cubescript.hh index dfabf53..9a08de4 100644 --- a/include/cubescript/cubescript.hh +++ b/include/cubescript/cubescript.hh @@ -4,7 +4,6 @@ #include "cubescript_conf.hh" #include "cubescript/platform.hh" -#include "cubescript/callable.hh" #include "cubescript/error.hh" #include "cubescript/value.hh" #include "cubescript/ident.hh" diff --git a/include/cubescript/cubescript/callable.hh b/include/cubescript/cubescript/callable.hh index 96f90db..9a5e74c 100644 --- a/include/cubescript/cubescript/callable.hh +++ b/include/cubescript/cubescript/callable.hh @@ -8,6 +8,7 @@ #include namespace cubescript { +namespace internal { template struct callable { @@ -205,6 +206,7 @@ public: } }; +} /* namespace internal */ } /* namespace cubescript */ #endif /* LIBCUBESCRIPT_CUBESCRIPT_CALLABLE_HH */ diff --git a/include/cubescript/cubescript/state.hh b/include/cubescript/cubescript/state.hh index 1a9c04f..43dbefc 100644 --- a/include/cubescript/cubescript/state.hh +++ b/include/cubescript/cubescript/state.hh @@ -13,8 +13,8 @@ namespace cubescript { using alloc_func = void *(*)(void *, void *, size_t, size_t); -using hook_func = callable; -using command_func = callable< +using hook_func = internal::callable; +using command_func = internal::callable< void, struct state &, std::span, struct any_value & >;