github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-22 11:22:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Fix inconsistent noexcept-ness between header/implementation"

Browse Source 
This reverts commit ccb6cb1abe.

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.
This commit is contained in:
Johannes Altmanninger 2022-04-24 21:44:42 +02:00
parent 1dc5268847
commit 71ff8780c6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/autoload.h
View File

@ -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.

4
src/complete.cpp
View File

@ -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(