diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 16:42:06 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-31 16:42:06 -0700 |
| commit | a7c13ce724ea9f3853f8a572dbe9b4cdc0672a3d (patch) | |
| tree | 10d251c2c91bf03a31bef6fad41da77727ea3b35 | |
| parent | 60445c11508bce7c9813a86230941c730c71e931 (diff) | |
| download | vcpkg-a7c13ce724ea9f3853f8a572dbe9b4cdc0672a3d.tar.gz vcpkg-a7c13ce724ea9f3853f8a572dbe9b4cdc0672a3d.zip | |
Use cwstring_view in CMakeVariable
| -rw-r--r-- | toolsrc/include/vcpkglib.h | 8 | ||||
| -rw-r--r-- | toolsrc/src/vcpkglib.cpp | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/toolsrc/include/vcpkglib.h b/toolsrc/include/vcpkglib.h index 864c7de79..b589c1617 100644 --- a/toolsrc/include/vcpkglib.h +++ b/toolsrc/include/vcpkglib.h @@ -24,10 +24,10 @@ namespace vcpkg struct CMakeVariable { - CMakeVariable(const std::wstring& varname, const wchar_t* varvalue); - CMakeVariable(const std::wstring& varname, const std::string& varvalue); - CMakeVariable(const std::wstring& varname, const std::wstring& varvalue); - CMakeVariable(const std::wstring& varname, const fs::path& path); + CMakeVariable(const cwstring_view varname, const wchar_t* varvalue); + CMakeVariable(const cwstring_view varname, const std::string& varvalue); + CMakeVariable(const cwstring_view varname, const std::wstring& varvalue); + CMakeVariable(const cwstring_view varname, const fs::path& path); std::wstring s; }; diff --git a/toolsrc/src/vcpkglib.cpp b/toolsrc/src/vcpkglib.cpp index df95fbb35..1f638dc49 100644 --- a/toolsrc/src/vcpkglib.cpp +++ b/toolsrc/src/vcpkglib.cpp @@ -215,10 +215,10 @@ namespace vcpkg return installed_files; } - CMakeVariable::CMakeVariable(const std::wstring& varname, const wchar_t* varvalue) : s(Strings::wformat(LR"("-D%s=%s")", varname, varvalue)) { } - CMakeVariable::CMakeVariable(const std::wstring& varname, const std::string& varvalue) : CMakeVariable(varname, Strings::utf8_to_utf16(varvalue).c_str()) { } - CMakeVariable::CMakeVariable(const std::wstring& varname, const std::wstring& varvalue) : CMakeVariable(varname, varvalue.c_str()) {} - CMakeVariable::CMakeVariable(const std::wstring& varname, const fs::path& path) : CMakeVariable(varname, path.generic_wstring()) {} + CMakeVariable::CMakeVariable(const cwstring_view varname, const wchar_t* varvalue) : s(Strings::wformat(LR"("-D%s=%s")", varname, varvalue)) { } + CMakeVariable::CMakeVariable(const cwstring_view varname, const std::string& varvalue) : CMakeVariable(varname, Strings::utf8_to_utf16(varvalue).c_str()) { } + CMakeVariable::CMakeVariable(const cwstring_view varname, const std::wstring& varvalue) : CMakeVariable(varname, varvalue.c_str()) {} + CMakeVariable::CMakeVariable(const cwstring_view varname, const fs::path& path) : CMakeVariable(varname, path.generic_wstring()) {} std::wstring make_cmake_cmd(const fs::path& cmake_exe, const fs::path& cmake_script, const std::vector<CMakeVariable>& pass_variables) { |