diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 12:14:35 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-04-24 12:48:27 +0300 |
| commit | 39a4985520ebeb8c77d657e4624359a484ad330f (patch) | |
| tree | 996c5891a58ad1db8921dfd84434fcf7c7b8b232 /sql/filesort.cc | |
| parent | 2a00bdeb4a65f9f56372a9f01d8bee21fe58407c (diff) | |
| download | mariadb-git-39a4985520ebeb8c77d657e4624359a484ad330f.tar.gz | |
Remove most 'register' use in C++
Modern compilers (such as GCC 8) emit warnings that the
'register' keyword is deprecated and not valid C++17.
Let us remove most use of the 'register' keyword.
Code in 'extra/' is not touched.
Diffstat (limited to 'sql/filesort.cc')
| -rw-r--r-- | sql/filesort.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sql/filesort.cc b/sql/filesort.cc index d6bdebee3d3..db52debe957 100644 --- a/sql/filesort.cc +++ b/sql/filesort.cc @@ -1165,8 +1165,7 @@ Type_handler_real_result::make_sort_key(uchar *to, Item *item, /** Make a sort-key from record. */ -static void make_sortkey(register Sort_param *param, - register uchar *to, uchar *ref_pos) +static void make_sortkey(Sort_param *param, uchar *to, uchar *ref_pos) { reg3 Field *field; reg1 SORT_FIELD *sort_field; @@ -1458,7 +1457,7 @@ bool check_if_pq_applicable(Sort_param *param, int merge_many_buff(Sort_param *param, uchar *sort_buffer, BUFFPEK *buffpek, uint *maxbuffer, IO_CACHE *t_file) { - register uint i; + uint i; IO_CACHE t_file2,*from_file,*to_file,*temp; BUFFPEK *lastbuff; DBUG_ENTER("merge_many_buff"); @@ -1513,7 +1512,7 @@ cleanup: uint read_to_buffer(IO_CACHE *fromfile, BUFFPEK *buffpek, uint rec_length) { - register uint count; + uint count; uint length; if ((count=(uint) MY_MIN((ha_rows) buffpek->max_keys,buffpek->count))) @@ -1817,7 +1816,7 @@ int merge_buffers(Sort_param *param, IO_CACHE *from_file, } else { - register uchar *end; + uchar *end; src= buffpek->key+offset; for (end= src+buffpek->mem_count*rec_length ; src != end ; |