diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2014-02-05 16:20:09 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2014-02-05 19:23:13 -0800 |
| commit | fd10844c2b5fe0c1efa2dc034e6c9173b5ed82cb (patch) | |
| tree | d161223df4ca3dbbda2a5f9f5915943149fd8c3b /parse_tree.cpp | |
| parent | 35f230235290be2bb482acab986d7017c77ca208 (diff) | |
Unbreak C++11 due to narrowing; use non-conflicting declaration FISH_COLORS instead of COLORS; remove deprecated register type.
Diffstat (limited to 'parse_tree.cpp')
| -rw-r--r-- | parse_tree.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/parse_tree.cpp b/parse_tree.cpp index 3643252c..0db2a06d 100644 --- a/parse_tree.cpp +++ b/parse_tree.cpp @@ -1065,10 +1065,14 @@ static parse_keyword_t keyword_for_token(token_type tok, const wchar_t *tok_txt) } /* Placeholder invalid token */ -static const parse_token_t kInvalidToken = {token_type_invalid, parse_keyword_none, false, false, -1, -1}; +static const parse_token_t kInvalidToken = {token_type_invalid, +parse_keyword_none, false, false, static_cast<size_t>(-1), + static_cast<size_t>(-1)}; /* Terminal token */ -static const parse_token_t kTerminalToken = {parse_token_type_terminate, parse_keyword_none, false, false, -1, -1}; +static const parse_token_t kTerminalToken = {parse_token_type_terminate, +parse_keyword_none, false, false, static_cast<size_t>(-1), + static_cast<size_t>(-1)}; static inline bool is_help_argument(const wchar_t *txt) { |