From 6e5d6c3f0e83201b5d20a4823d12c0c448b9b876 Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Thu, 27 Jul 2023 11:58:56 +0200 Subject: [PATCH] gccrs: proc_macro: Remove useless typedef Initially a typedef was used to easily get the callback function pointer type. Since this type has changed to a simpler well defined type, this using declaration has no more purpose. libgrust/ChangeLog: * libproc_macro/proc_macro.cc: Remove type alias. * libproc_macro/registration.h: Likewise. Signed-off-by: Pierre-Emmanuel Patry --- libgrust/libproc_macro/proc_macro.cc | 2 +- libgrust/libproc_macro/registration.h | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libgrust/libproc_macro/proc_macro.cc b/libgrust/libproc_macro/proc_macro.cc index b1e108e74eb1..293fc9570382 100644 --- a/libgrust/libproc_macro/proc_macro.cc +++ b/libgrust/libproc_macro/proc_macro.cc @@ -60,5 +60,5 @@ bridge_is_available () } // namespace ProcMacro ProcMacro::from_str_function_t __gccrs_proc_macro_from_str_fn = nullptr; -ProcMacro::is_available_t __gccrs_proc_macro_is_available_fn +ProcMacro::BridgeState __gccrs_proc_macro_is_available_fn = ProcMacro::BridgeState::Unavailable; diff --git a/libgrust/libproc_macro/registration.h b/libgrust/libproc_macro/registration.h index 0074e993488e..aba7edd81fba 100644 --- a/libgrust/libproc_macro/registration.h +++ b/libgrust/libproc_macro/registration.h @@ -30,11 +30,10 @@ namespace ProcMacro { using from_str_function_t = ProcMacro::TokenStream (*) (std::string &, bool &); -using is_available_t = ProcMacro::BridgeState; } // namespace ProcMacro extern "C" ProcMacro::from_str_function_t __gccrs_proc_macro_from_str_fn; -extern "C" ProcMacro::is_available_t __gccrs_proc_macro_is_available_fn; +extern "C" ProcMacro::BridgeState __gccrs_proc_macro_is_available_fn; #endif /* !REGISTRATION_H */ -- 2.47.2