From 71ff8780c6702589b687bc89f28e8e3eb5d001fb Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Sun, 24 Apr 2022 21:44:42 +0200 Subject: [PATCH] Revert "Fix inconsistent noexcept-ness between header/implementation" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ccb6cb1abe706ed3e5fddbf5dc2c29725eaa069c. CI fails with /home/runner/work/fish-shell/fish-shell/src/autoload.cpp:148:1: error: function ‘autoload_t::autoload_t(autoload_t&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ 148 | autoload_t::autoload_t(autoload_t &&) noexcept = default; | ^~~~~~~~~~ make[2]: *** [CMakeFiles/fishlib.dir/build.make:96: CMakeFiles/fishlib.dir/src/autoload.cpp.o] Error 1 make[1]: *** [CMakeFiles/Makefile2:369: CMakeFiles/fishlib.dir/all] Error 2 make: *** [Makefile:139: all] Error 2 Not sure what's wrong - it compiles fine on my machine. Will check later. --- src/autoload.h | 2 +- src/complete.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/autoload.h b/src/autoload.h index ef468f686..64efce9c4 100644 --- a/src/autoload.h +++ b/src/autoload.h @@ -54,7 +54,7 @@ class autoload_t { /// Construct an autoloader that loads from the paths given by \p env_var_name. explicit autoload_t(wcstring env_var_name); - autoload_t(autoload_t &&) noexcept; + autoload_t(autoload_t &&); ~autoload_t(); /// Given a command, get a path to autoload. diff --git a/src/complete.cpp b/src/complete.cpp index d54eb24d9..584296d55 100644 --- a/src/complete.cpp +++ b/src/complete.cpp @@ -226,9 +226,9 @@ completion_t::completion_t(wcstring comp, wcstring desc, string_fuzzy_match_t ma flags(resolve_auto_space(completion, flags_val)) {} completion_t::completion_t(const completion_t &) = default; -completion_t::completion_t(completion_t &&) noexcept = default; +completion_t::completion_t(completion_t &&) = default; completion_t &completion_t::operator=(const completion_t &) = default; -completion_t &completion_t::operator=(completion_t &&) noexcept = default; +completion_t &completion_t::operator=(completion_t &&) = default; completion_t::~completion_t() = default; __attribute__((always_inline)) static inline bool natural_compare_completions(