Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-09-21 06:51:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove __packed

Browse source 
We can use the new C++11 enum type feature to stop using this non-portable
__packed.
This commit is contained in:
ridiculousfish 2019-08-10 16:04:05 -07:00
parent 30fd526fc1
commit fd5d8c1949
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config_cmake.h.in
View file

@ -168,11 +168,7 @@
#ifndef __sentinel
#define __sentinel __attribute__ ((sentinel))
#endif
#ifndef __packed
#define __packed __attribute__ ((packed))
#endif
#else
#define __warn_unused
#define __sentinel
#define __packed
#endif

8
src/parse_constants.h
View file

@ -13,7 +13,7 @@
} while (0)
// IMPORTANT: If the following enum table is modified you must also update token_enum_map below.
enum parse_token_type_t {
enum parse_token_type_t : uint8_t {
token_type_invalid = 1,
// Non-terminal tokens
symbol_job_list,
@ -71,7 +71,7 @@ enum parse_token_type_t {
LAST_TOKEN_OR_SYMBOL = parse_token_type_terminate,
FIRST_PARSE_TOKEN_TYPE = parse_token_type_string,
LAST_PARSE_TOKEN_TYPE = parse_token_type_end
} __packed;
};
const enum_map<parse_token_type_t> token_enum_map[] = {
{parse_special_type_comment, L"parse_special_type_comment"},
@ -96,7 +96,7 @@ const enum_map<parse_token_type_t> token_enum_map[] = {
// array below.
//
// IMPORTANT: These enums must start at zero.
enum parse_keyword_t {
enum parse_keyword_t : uint8_t {
parse_keyword_and,
parse_keyword_begin,
parse_keyword_builtin,
@ -115,7 +115,7 @@ enum parse_keyword_t {
parse_keyword_or,
parse_keyword_switch,
parse_keyword_while,
} __packed;
};
const enum_map<parse_keyword_t> keyword_enum_map[] = {{parse_keyword_exclam, L"!"},
{parse_keyword_and, L"and"},