h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-07-01 08:11:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Re-implement macro to constexpr transition"

Browse Source 
This reverts commit 3d8f98c395.

In addition to the issues mentioned on the GitHub page for this commit,
it also broke the CentOS 7 build.

Note one can locally test the CentOS 7 build via:

    ./docker/docker_run_tests.sh ./docker/centos7.Dockerfile
This commit is contained in:
ridiculousfish
2022-09-20 11:58:37 -07:00
parent 4ffcbe3526
commit 5f4583b52d
37 changed files with 116 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/input.cpp
View File

@@ -32,7 +32,7 @@
#include "wutil.h" // IWYU pragma: keep
/// A name for our own key mapping for nul.
constexpr const wchar_t k_nul_mapping_name[] = L"nul";
static const wchar_t *k_nul_mapping_name = L"nul";
/// Struct representing a keybinding. Returned by input_get_mappings.
struct input_mapping_t {
@@ -72,7 +72,7 @@ struct terminfo_mapping_t {
terminfo_mapping_t(const wchar_t *name, std::string s) : name(name), seq(std::move(s)) {}
};
constexpr size_t input_function_count = R_END_INPUT_FUNCTIONS;
static constexpr size_t input_function_count = R_END_INPUT_FUNCTIONS;
/// Input function metadata. This list should be kept in sync with the key code list in
/// input_common.h.