From 4d9548876e1654f86301d284af1b795c6b5bacfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Mon, 2 Dec 2024 10:44:06 +0200 Subject: [PATCH] MDEV-31340 fixup: clang++-20 -Wdeprecated-literal-operator --- include/m_string.h | 2 +- sql/lex_ident.h | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/m_string.h b/include/m_string.h index 148d1a4166b..060ab2c21d1 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -222,7 +222,7 @@ typedef struct st_mysql_const_lex_string LEX_CSTRING; #ifdef __cplusplus static inline constexpr -LEX_CSTRING operator"" _LEX_CSTRING(const char *str, size_t length) +LEX_CSTRING operator""_LEX_CSTRING(const char *str, size_t length) { return LEX_CSTRING{str, length}; } diff --git a/sql/lex_ident.h b/sql/lex_ident.h index a8f3b66fbdd..e5b6bf3f970 100644 --- a/sql/lex_ident.h +++ b/sql/lex_ident.h @@ -386,48 +386,48 @@ public: static inline constexpr -Lex_ident_table operator"" _Lex_ident_table(const char *str, size_t length) +Lex_ident_table operator""_Lex_ident_table(const char *str, size_t length) { return Lex_ident_table(str, length); } static inline constexpr -Lex_ident_column operator"" _Lex_ident_column(const char *str, size_t length) +Lex_ident_column operator""_Lex_ident_column(const char *str, size_t length) { return Lex_ident_column(str, length); } static inline constexpr -Lex_ident_i_s_table operator"" _Lex_ident_i_s_table(const char *str, - size_t length) +Lex_ident_i_s_table operator""_Lex_ident_i_s_table(const char *str, + size_t length) { return Lex_ident_i_s_table(str, length); } static inline constexpr -Lex_ident_engine operator"" _Lex_ident_engine(const char *str, size_t length) +Lex_ident_engine operator""_Lex_ident_engine(const char *str, size_t length) { return Lex_ident_engine(str, length); } static inline constexpr -Lex_ident_locale operator"" _Lex_ident_locale(const char *str, size_t length) +Lex_ident_locale operator""_Lex_ident_locale(const char *str, size_t length) { return Lex_ident_locale(str, length); } static inline constexpr -Lex_ident_charset operator"" _Lex_ident_charset(const char *str, size_t length) +Lex_ident_charset operator""_Lex_ident_charset(const char *str, size_t length) { return Lex_ident_charset(str, length); } static inline constexpr -Lex_ident_plugin operator"" _Lex_ident_plugin(const char *str, size_t length) +Lex_ident_plugin operator""_Lex_ident_plugin(const char *str, size_t length) { return Lex_ident_plugin(str, length); }