1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix g++-14 -Wtemplate-id-cdtor

Browse Source
This commit is contained in:
Marko Mäkelä 2024-03-19 08:09:31 +02:00
parent 83a87da430
commit 2a8c4ccf2e
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugin/versioning/versioning.cc
View File

@ -35,8 +35,8 @@ public:
static Create_func_trt<TRT_FIELD> s_singleton; static Create_func_trt<TRT_FIELD> s_singleton;
protected: protected:
Create_func_trt<TRT_FIELD>() = default; Create_func_trt() = default;
virtual ~Create_func_trt<TRT_FIELD>() = default; virtual ~Create_func_trt() = default;
}; };
template<TR_table::field_id_t TRT_FIELD> template<TR_table::field_id_t TRT_FIELD>
@ -131,8 +131,8 @@ public:
static Create_func_trt_trx_sees<Item_func_trt_trx_seesX> s_singleton; static Create_func_trt_trx_sees<Item_func_trt_trx_seesX> s_singleton;
protected: protected:
Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() = default; Create_func_trt_trx_sees() = default;
virtual ~Create_func_trt_trx_sees<Item_func_trt_trx_seesX>() = default; virtual ~Create_func_trt_trx_sees() = default;
}; };
template<class X> template<class X>

8
sql/item_cmpfunc.h
View File

@ -3301,13 +3301,11 @@ template <template<class> class LI, typename T> class Item_equal_iterator
{ {
protected: protected:
Item_equal *item_equal; Item_equal *item_equal;
Item *curr_item; Item *curr_item= nullptr;
public: public:
Item_equal_iterator<LI,T>(Item_equal &item_eq) Item_equal_iterator(Item_equal &item_eq)
:LI<T> (item_eq.equal_items) :LI<T> (item_eq.equal_items), item_equal(&item_eq)
{ {
curr_item= NULL;
item_equal= &item_eq;
if (item_eq.with_const) if (item_eq.with_const)
{ {
LI<T> *list_it= this; LI<T> *list_it= this;