diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2012-08-01 16:32:52 -0700 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2012-08-04 11:34:45 -0700 |
| commit | 8185bee4b83ce94f098cd07a360a0d78ad781c78 (patch) | |
| tree | 9d93c0c617de4c25e4acd49ff8383ce2a8d84e0c /fish_pager.cpp | |
| parent | 2e1b3325c63cd6c43a10a08acfc54d1fb29a5c03 (diff) | |
Lots of work towards making fish build without warnings on Mountain Lion, mostly in terms of using size_t instead of int
Diffstat (limited to 'fish_pager.cpp')
| -rw-r--r-- | fish_pager.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fish_pager.cpp b/fish_pager.cpp index d108d116..7c67d348 100644 --- a/fish_pager.cpp +++ b/fish_pager.cpp @@ -480,7 +480,7 @@ static void completion_print( int cols, int row_stop, wchar_t *prefix, int is_quoted, - std::vector<comp_t *> &lst ) + const std::vector<comp_t *> &lst ) { size_t rows = (lst.size()-1)/cols+1; @@ -549,9 +549,9 @@ static int completion_try_print( int cols, */ int print=0; - int i, j; + long i, j; - long rows = (lst.size()-1)/cols+1; + int rows = (int)((lst.size()-1)/cols+1); int pref_tot_width=0; int min_tot_width = 0; @@ -573,7 +573,7 @@ static int completion_try_print( int cols, { int pref,min; comp_t *c; - if( (int)lst.size() <= j*rows + i ) + if( lst.size() <= j*rows + i ) continue; c = lst.at(j*rows + i ); @@ -613,7 +613,7 @@ static int completion_try_print( int cols, } else { - int next_rows = (lst.size()-1)/(cols-1)+1; + long next_rows = (lst.size()-1)/(cols-1)+1; /* fwprintf( stderr, L"cols %d, min_tot %d, term %d, rows=%d, nextrows %d, termrows %d, diff %d\n", cols, |