Commit f3bacd70 authored by Sergei Golubchik's avatar Sergei Golubchik

cleanup: make Name and STRING_WITH_LEN usable in constexpr

parent 15a42a0a
...@@ -201,7 +201,7 @@ extern ulonglong strtoull(const char *str, char **ptr, int base); ...@@ -201,7 +201,7 @@ extern ulonglong strtoull(const char *str, char **ptr, int base);
#ifdef __cplusplus #ifdef __cplusplus
#include <type_traits> #include <type_traits>
template<typename T> inline const char *_swl_check(T s) template<typename T> inline constexpr const char *_swl_check(T s)
{ {
static_assert(std::is_same<T, const char (&)[sizeof(T)]>::value static_assert(std::is_same<T, const char (&)[sizeof(T)]>::value
|| std::is_same<T, const char [sizeof(T)]>::value, || std::is_same<T, const char [sizeof(T)]>::value,
......
...@@ -3384,17 +3384,12 @@ class Type_cast_attributes ...@@ -3384,17 +3384,12 @@ class Type_cast_attributes
class Name: private LEX_CSTRING class Name: private LEX_CSTRING
{ {
public: public:
Name(const char *str_arg, uint length_arg) constexpr Name(const char *str_arg, uint length_arg) :
{ LEX_CSTRING({str_arg, length_arg})
DBUG_ASSERT(length_arg < UINT_MAX32); { }
LEX_CSTRING::str= str_arg; constexpr Name(const LEX_CSTRING &lcs) :
LEX_CSTRING::length= length_arg; LEX_CSTRING(lcs)
} { }
Name(const LEX_CSTRING &lcs)
{
LEX_CSTRING::str= lcs.str;
LEX_CSTRING::length= lcs.length;
}
const char *ptr() const { return LEX_CSTRING::str; } const char *ptr() const { return LEX_CSTRING::str; }
uint length() const { return (uint) LEX_CSTRING::length; } uint length() const { return (uint) LEX_CSTRING::length; }
const LEX_CSTRING &lex_cstring() const { return *this; } const LEX_CSTRING &lex_cstring() const { return *this; }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment