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/plistsort.c | |
| 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/plistsort.c')
| -rw-r--r-- | sql/plistsort.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/plistsort.c b/sql/plistsort.c index 99657410fe0..e66bd7c7276 100644 --- a/sql/plistsort.c +++ b/sql/plistsort.c @@ -91,7 +91,7 @@ recursion_point: } { - register struct LS_STRUCT_NAME *sp0= sp++; + struct LS_STRUCT_NAME *sp0= sp++; sp->list_len= sp0->list_len >> 1; sp0->list_len-= sp->list_len; sp->return_point= 0; @@ -100,7 +100,7 @@ recursion_point: return_point0: sp->list1= sorted_list; { - register struct LS_STRUCT_NAME *sp0= sp++; + struct LS_STRUCT_NAME *sp0= sp++; list= list_end; sp->list_len= sp0->list_len; sp->return_point= 1; @@ -108,9 +108,9 @@ return_point0: goto recursion_point; return_point1: { - register LS_LIST_ITEM **hook= &sorted_list; - register LS_LIST_ITEM *list1= sp->list1; - register LS_LIST_ITEM *list2= sorted_list; + LS_LIST_ITEM **hook= &sorted_list; + LS_LIST_ITEM *list1= sp->list1; + LS_LIST_ITEM *list2= sorted_list; if (LS_COMPARE_FUNC_CALL(list1, list2)) { |