From 7fcb89e4592eb0ab381c82ec55f4e62af1a867f0 Mon Sep 17 00:00:00 2001 From: King_DuckZ Date: Fri, 29 Apr 2022 18:15:02 +0200 Subject: [PATCH] Move more stuff to wren_types.hpp --- include/wrenpp/def_configuration.hpp | 4 ---- include/wrenpp/vm_fun.hpp | 3 +-- include/wrenpp/wren_types.hpp | 5 +++++ 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/wrenpp/def_configuration.hpp b/include/wrenpp/def_configuration.hpp index 11281e5..a51fbb4 100644 --- a/include/wrenpp/def_configuration.hpp +++ b/include/wrenpp/def_configuration.hpp @@ -22,10 +22,6 @@ #include "error_type.hpp" namespace wren { - class VM; - - typedef void(*foreign_method_t)(VM&); - class DefConfiguration : public Configuration { public: static void write_fn (VM*, wren_string_t text); diff --git a/include/wrenpp/vm_fun.hpp b/include/wrenpp/vm_fun.hpp index b208c5f..252662c 100644 --- a/include/wrenpp/vm_fun.hpp +++ b/include/wrenpp/vm_fun.hpp @@ -22,6 +22,7 @@ #if defined(WRENPP_WITH_NAME_GUESSING) # include "guess_class_name.hpp" #endif +#include "wren_types.hpp" #include #include #include @@ -30,8 +31,6 @@ #include namespace wren { - typedef std::tuple ModuleAndName; - namespace detail { template struct GetTypeToRetType; template using GetTypeToRetType_t = typename GetTypeToRetType::type; diff --git a/include/wrenpp/wren_types.hpp b/include/wrenpp/wren_types.hpp index db9a6f4..db4540a 100644 --- a/include/wrenpp/wren_types.hpp +++ b/include/wrenpp/wren_types.hpp @@ -16,7 +16,12 @@ */ #include +#include namespace wren { + class VM; + typedef std::string_view wren_string_t; + typedef void(*foreign_method_t)(VM&); + typedef std::tuple ModuleAndName; } //namespace wren