mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 928351 - Fixed -Wshadow warning.
This commit is contained in:
parent
728dc6bf41
commit
bfdf7f8600
@ -66,8 +66,8 @@ class char16ptr_t
|
|||||||
static_assert(sizeof(char16_t) == sizeof(wchar_t), "char16_t and wchar_t sizes differ");
|
static_assert(sizeof(char16_t) == sizeof(wchar_t), "char16_t and wchar_t sizes differ");
|
||||||
|
|
||||||
public:
|
public:
|
||||||
char16ptr_t(const char16_t* ptr) : ptr(ptr) {}
|
char16ptr_t(const char16_t* p) : ptr(p) {}
|
||||||
char16ptr_t(const wchar_t* ptr) : ptr(reinterpret_cast<const char16_t*>(ptr)) {}
|
char16ptr_t(const wchar_t* p) : ptr(reinterpret_cast<const char16_t*>(p)) {}
|
||||||
|
|
||||||
/* Without this, nullptr assignment would be ambiguous. */
|
/* Without this, nullptr assignment would be ambiguous. */
|
||||||
constexpr char16ptr_t(decltype(nullptr)) : ptr(nullptr) {}
|
constexpr char16ptr_t(decltype(nullptr)) : ptr(nullptr) {}
|
||||||
|
Loading…
Reference in New Issue
Block a user