diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-05-04 14:54:23 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-05-04 14:54:23 -0700 |
| commit | a94efe662b0537a606d40bdd4b986b5b2ea246e2 (patch) | |
| tree | f741d6b99225c7bda5fb7b349a1a5bf3ac50ab9d /toolsrc/src/vcpkg.cpp | |
| parent | f920d0e5208a75dcb14ac4fcb5b7c83edbaab861 (diff) | |
| download | vcpkg-a94efe662b0537a606d40bdd4b986b5b2ea246e2.tar.gz vcpkg-a94efe662b0537a606d40bdd4b986b5b2ea246e2.zip | |
Rename Strings:: function for utf8/utf16 conversion
Diffstat (limited to 'toolsrc/src/vcpkg.cpp')
| -rw-r--r-- | toolsrc/src/vcpkg.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index d24fad0e6..661d667bd 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -41,7 +41,7 @@ static void inner(const VcpkgCmdArguments& args) fs::path vcpkg_root_dir; if (args.vcpkg_root_dir != nullptr) { - vcpkg_root_dir = fs::stdfs::absolute(Strings::utf8_to_utf16(*args.vcpkg_root_dir)); + vcpkg_root_dir = fs::stdfs::absolute(Strings::to_utf16(*args.vcpkg_root_dir)); } else { @@ -85,7 +85,7 @@ static void inner(const VcpkgCmdArguments& args) System::get_environmental_variable(L"VCPKG_DEFAULT_TRIPLET"); if (auto v = vcpkg_default_triplet_env.get()) { - default_triplet = Triplet::from_canonical_name(Strings::utf16_to_utf8(*v)); + default_triplet = Triplet::from_canonical_name(Strings::to_utf8(*v)); } else { @@ -200,7 +200,7 @@ int wmain(const int argc, const wchar_t* const* const argv) Metrics::track_property("version", Commands::Version::version()); - const std::string trimmed_command_line = trim_path_from_command_line(Strings::utf16_to_utf8(GetCommandLineW())); + const std::string trimmed_command_line = trim_path_from_command_line(Strings::to_utf8(GetCommandLineW())); Metrics::track_property("cmdline", trimmed_command_line); loadConfig(); Metrics::track_property("sqmuser", Metrics::get_SQM_user()); @@ -247,6 +247,6 @@ int wmain(const int argc, const wchar_t* const* const argv) exc_msg); fflush(stdout); for (int x = 0; x < argc; ++x) - System::println("%s|", Strings::utf16_to_utf8(argv[x])); + System::println("%s|", Strings::to_utf8(argv[x])); fflush(stdout); } |
