database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

MDEV-19740: Fix C++11 violations caught by GCC 9.2.1

Browse Source
This commit is contained in:
Marko Mäkelä
2019-08-15 15:06:27 +03:00
parent 0b20b9e911
commit ec28f9532e
2 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sql/sql_list.h
View File

@ -1,6 +1,7 @@
#ifndef INCLUDES_MYSQL_SQL_LIST_H
#define INCLUDES_MYSQL_SQL_LIST_H
/* Copyright (c) 2000, 2012, Oracle and/or its affiliates.
Copyright (c) 2019, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -86,6 +87,14 @@ public:
next= elements ? tmp.next : &first;
}
SQL_I_List& operator=(const SQL_I_List &tmp)
{
elements= tmp.elements;
first= tmp.first;
next= tmp.next;
return *this;
}
inline void empty()
{
elements= 0;
@ -176,6 +185,13 @@ public:
first == rhs.first &&
last == rhs.last;
}
base_list& operator=(const base_list &rhs)
{
elements= rhs.elements;
first= rhs.first;
last= elements ? rhs.last : &first;
return *this;
}
inline void empty() { elements=0; first= &end_of_list; last=&first;}
inline base_list() { empty(); }
@ -190,9 +206,7 @@ public:
*/
inline base_list(const base_list &tmp) :Sql_alloc()
{
elements= tmp.elements;
first= tmp.first;
last= elements ? tmp.last : &first;
*this= tmp;
}
/**
Construct a deep copy of the argument in memory root mem_root.
@ -202,7 +216,7 @@ public:
*/
bool copy(const base_list *rhs, MEM_ROOT *mem_root);
base_list(const base_list &rhs, MEM_ROOT *mem_root) { copy(&rhs, mem_root); }
inline base_list(bool error) { }
inline base_list(bool) {}
inline bool push_back(void *info)
{
if (((*last)=new list_node(info, &end_of_list)))
@ -523,7 +537,6 @@ template <class T> class List :public base_list
{
public:
inline List() :base_list() {}
inline List(const List<T> &tmp) :base_list(tmp) {}
inline List(const List<T> &tmp, MEM_ROOT *mem_root) :
base_list(tmp, mem_root) {}
inline bool push_back(T *a) { return base_list::push_back(a); }