diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-08-06 23:01:28 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:00:25 +0300 |
| commit | 82934e8797651b934569ba77bd9fd6d8f75e87e6 (patch) | |
| tree | ee1148659e3fe272b74465c781c5c9ae48cd28f0 /src | |
| parent | 278de872f76cb617c969037468a832245615090f (diff) | |
| download | rneovim-82934e8797651b934569ba77bd9fd6d8f75e87e6.tar.gz rneovim-82934e8797651b934569ba77bd9fd6d8f75e87e6.tar.bz2 rneovim-82934e8797651b934569ba77bd9fd6d8f75e87e6.zip | |
shada: Fix GCC -Wconversion warnings in srni_flags definitions
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/shada.c | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/src/nvim/shada.c b/src/nvim/shada.c index 2ba0398541..be049fbb20 100644 --- a/src/nvim/shada.c +++ b/src/nvim/shada.c @@ -1099,25 +1099,26 @@ static void shada_read(ShaDaReadDef *const sd_reader, const int flags) && (force || oldfiles_list == NULL || oldfiles_list->lv_len == 0)); const bool want_marks = flags & kShaDaWantMarks; - const unsigned srni_flags = ((flags & kShaDaWantInfo - ? (kSDReadUndisableableData - | kSDReadRegisters - | kSDReadGlobalMarks - | (p_hi ? kSDReadHistory : 0) - | (find_shada_parameter('!') != NULL - ? kSDReadVariables - : 0) - | (find_shada_parameter('%') != NULL - && ARGCOUNT == 0 - ? kSDReadBufferList - : 0)) - : 0) - | (want_marks && get_shada_parameter('\'') > 0 - ? kSDReadLocalMarks | kSDReadChanges - : 0) - | (get_old_files - ? kSDReadLocalMarks - : 0)); + const unsigned srni_flags = (unsigned) ( + (flags & kShaDaWantInfo + ? (kSDReadUndisableableData + | kSDReadRegisters + | kSDReadGlobalMarks + | (p_hi ? kSDReadHistory : 0) + | (find_shada_parameter('!') != NULL + ? kSDReadVariables + : 0) + | (find_shada_parameter('%') != NULL + && ARGCOUNT == 0 + ? kSDReadBufferList + : 0)) + : 0) + | (want_marks && get_shada_parameter('\'') > 0 + ? kSDReadLocalMarks | kSDReadChanges + : 0) + | (get_old_files + ? kSDReadLocalMarks + : 0)); if (srni_flags == 0) { // Nothing to do. return; @@ -2039,7 +2040,7 @@ static ShaDaWriteResult shada_write(ShaDaWriteDef *const sd_writer, } } - const unsigned srni_flags = ( + const unsigned srni_flags = (unsigned) ( kSDReadUndisableableData | kSDReadUnknown | (dump_history ? kSDReadHistory : 0) |