[CStringView] Rename parameter, add copy ctor

This commit is contained in:
Alexander Karatarakis 2017-04-28 13:22:50 -07:00
parent ae1e1af245
commit fa98edde02

View File

@ -8,10 +8,10 @@ namespace vcpkg
{ {
constexpr BasicCStringView() : cstr(nullptr) {} constexpr BasicCStringView() : cstr(nullptr) {}
constexpr BasicCStringView(const CharType* cstr) : cstr(cstr) {} constexpr BasicCStringView(const CharType* cstr) : cstr(cstr) {}
constexpr BasicCStringView(const BasicCStringView&) = default;
BasicCStringView(const std::basic_string<CharType>& str) : cstr(str.c_str()) {} BasicCStringView(const std::basic_string<CharType>& str) : cstr(str.c_str()) {}
constexpr operator const CharType*() const { return cstr; } constexpr operator const CharType*() const { return cstr; }
constexpr const CharType* c_str() const { return cstr; } constexpr const CharType* c_str() const { return cstr; }
private: private:
@ -21,9 +21,9 @@ namespace vcpkg
using CStringView = BasicCStringView<char>; using CStringView = BasicCStringView<char>;
using CWStringView = BasicCStringView<wchar_t>; using CWStringView = BasicCStringView<wchar_t>;
inline const char* to_printf_arg(const CStringView spec) { return spec.c_str(); } inline const char* to_printf_arg(const CStringView string_view) { return string_view.c_str(); }
inline const wchar_t* to_wprintf_arg(const CWStringView spec) { return spec.c_str(); } inline const wchar_t* to_wprintf_arg(const CWStringView string_view) { return string_view.c_str(); }
static_assert(sizeof(CStringView) == sizeof(void*), "CStringView must be a simple wrapper around char*"); static_assert(sizeof(CStringView) == sizeof(void*), "CStringView must be a simple wrapper around char*");
static_assert(sizeof(CWStringView) == sizeof(void*), "CWStringView must be a simple wrapper around wchar_t*"); static_assert(sizeof(CWStringView) == sizeof(void*), "CWStringView must be a simple wrapper around wchar_t*");