aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-08-28 19:29:55 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-08-28 19:54:01 -0700
commit6684240090512f745bf7530b2fb4bcd31c3fb02e (patch)
treedba9143ed0d1a480aa8f147d6275af4f4aecfa9a /toolsrc/src
parent992f192c5e937f22877117e64ff7a38a6447c4bc (diff)
downloadvcpkg-6684240090512f745bf7530b2fb4bcd31c3fb02e.tar.gz
vcpkg-6684240090512f745bf7530b2fb4bcd31c3fb02e.zip
Use Strings::EMPTY
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/PackageSpec.cpp4
-rw-r--r--toolsrc/src/commands_remove.cpp2
-rw-r--r--toolsrc/src/metrics.cpp10
3 files changed, 8 insertions, 8 deletions
diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp
index a43bc5ff5..890de8899 100644
--- a/toolsrc/src/PackageSpec.cpp
+++ b/toolsrc/src/PackageSpec.cpp
@@ -38,7 +38,7 @@ namespace vcpkg
for (auto&& feature : spec->features)
f_specs.push_back(FeatureSpec{pspec, feature});
- if (spec->features.empty()) f_specs.push_back(FeatureSpec{pspec, ""});
+ if (spec->features.empty()) f_specs.push_back(FeatureSpec{pspec, Strings::EMPTY});
}
else
{
@@ -56,7 +56,7 @@ namespace vcpkg
std::vector<FeatureSpec> ret;
for (auto&& spec : specs)
{
- ret.emplace_back(spec.package_spec, "");
+ ret.emplace_back(spec.package_spec, Strings::EMPTY);
for (auto&& feature : spec.features)
ret.emplace_back(spec.package_spec, feature);
}
diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp
index db5357514..cca541c85 100644
--- a/toolsrc/src/commands_remove.cpp
+++ b/toolsrc/src/commands_remove.cpp
@@ -18,7 +18,7 @@ namespace vcpkg::Commands::Remove
{
auto& fs = paths.get_filesystem();
auto spghs = status_db->find_all(spec.name(), spec.triplet());
- auto core_pkg = **status_db->find(spec.name(), spec.triplet(), "");
+ auto core_pkg = **status_db->find(spec.name(), spec.triplet(), Strings::EMPTY);
for (auto&& spgh : spghs)
{
diff --git a/toolsrc/src/metrics.cpp b/toolsrc/src/metrics.cpp
index 6263c0fcb..8a7d02a30 100644
--- a/toolsrc/src/metrics.cpp
+++ b/toolsrc/src/metrics.cpp
@@ -25,7 +25,7 @@ namespace vcpkg::Metrics
errno_t err = gmtime_s(&newtime, &now);
if (err)
{
- return "";
+ return Strings::EMPTY;
}
strftime(&date[0], date.size(), "%Y-%m-%dT%H:%M:%S", &newtime);
@@ -125,16 +125,16 @@ namespace vcpkg::Metrics
path += L"\\kernel32.dll";
auto versz = GetFileVersionInfoSizeW(path.c_str(), nullptr);
- if (versz == 0) return "";
+ if (versz == 0) return Strings::EMPTY;
std::vector<char> verbuf;
verbuf.resize(versz);
- if (!GetFileVersionInfoW(path.c_str(), 0, static_cast<DWORD>(verbuf.size()), &verbuf[0])) return "";
+ if (!GetFileVersionInfoW(path.c_str(), 0, static_cast<DWORD>(verbuf.size()), &verbuf[0])) return Strings::EMPTY;
void* rootblock;
UINT rootblocksize;
- if (!VerQueryValueW(&verbuf[0], L"\\", &rootblock, &rootblocksize)) return "";
+ if (!VerQueryValueW(&verbuf[0], L"\\", &rootblock, &rootblocksize)) return Strings::EMPTY;
auto rootblock_ffi = static_cast<VS_FIXEDFILEINFO*>(rootblock);
@@ -377,7 +377,7 @@ namespace vcpkg::Metrics
path = vcpkgdir / "scripts" / "vcpkgmetricsuploader.exe";
if (fs.exists(path)) return path;
- return L"";
+ return Strings::WEMPTY;
}();
std::error_code ec;