diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 13:34:45 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-02-16 13:34:45 +0200 |
| commit | 2e431ff7e69d9c887777cc597ccf5cfb446e13d8 (patch) | |
| tree | 98be0df7531bbe1f26e1f339cf18430556bca933 /sql/tztime.cc | |
| parent | 80b4fa54e1d38c8f90f6b94240c583aa9d4627b7 (diff) | |
| parent | 1fd00998390a7487e42f5e29472e99354159c8bc (diff) | |
| download | mariadb-git-2e431ff7e69d9c887777cc597ccf5cfb446e13d8.tar.gz | |
Merge 10.11 into 11.0
Diffstat (limited to 'sql/tztime.cc')
| -rw-r--r-- | sql/tztime.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/tztime.cc b/sql/tztime.cc index 4d94054541d..a2add055deb 100644 --- a/sql/tztime.cc +++ b/sql/tztime.cc @@ -1027,7 +1027,7 @@ static const String tz_SYSTEM_name("SYSTEM", 6, &my_charset_latin1); class Time_zone_system : public Time_zone { public: - Time_zone_system() {} /* Remove gcc warning */ + Time_zone_system() = default; /* Remove gcc warning */ virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t, uint *error_code) const; virtual void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const; virtual const String * get_name() const; @@ -1123,7 +1123,7 @@ Time_zone_system::get_name() const class Time_zone_utc : public Time_zone { public: - Time_zone_utc() {} /* Remove gcc warning */ + Time_zone_utc() = default; /* Remove gcc warning */ virtual my_time_t TIME_to_gmt_sec(const MYSQL_TIME *t, uint *error_code) const; virtual void gmt_sec_to_TIME(MYSQL_TIME *tmp, my_time_t t) const; |