aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2018-05-31 10:51:00 -0700
committerRobert Schumacher <roschuma@microsoft.com>2018-05-31 10:51:00 -0700
commit3fc54807cb9b0bf242f8a2e7d1035bdbbd591aac (patch)
treecfbfb189435f73ed6f92830653d84122e22d2349
parentbc91dbe87f00edc1fd877665fb95eda8ad5cf0d8 (diff)
downloadvcpkg-3fc54807cb9b0bf242f8a2e7d1035bdbbd591aac.tar.gz
vcpkg-3fc54807cb9b0bf242f8a2e7d1035bdbbd591aac.zip
[vcpkg] Fix warnings on non-Windows
-rw-r--r--toolsrc/src/vcpkg/base/system.cpp2
-rw-r--r--toolsrc/src/vcpkg/commands.fetch.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp
index 1aa12d0a4..f59d31d74 100644
--- a/toolsrc/src/vcpkg/base/system.cpp
+++ b/toolsrc/src/vcpkg/base/system.cpp
@@ -254,7 +254,7 @@ namespace vcpkg::System
Debug::println("system(%s)", cmd_line.c_str());
fflush(nullptr);
int rc = system(cmd_line.c_str());
- Debug::println("system() returned %d", rc);
+ Debug::println("system() returned %d after %d us", rc, static_cast<int>(timer.microseconds()));
return rc;
#endif
}
diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp
index 33c5c1dcc..8fe4b489c 100644
--- a/toolsrc/src/vcpkg/commands.fetch.cpp
+++ b/toolsrc/src/vcpkg/commands.fetch.cpp
@@ -679,6 +679,7 @@ namespace vcpkg::Commands::Fetch
std::string major_version() const { return version.substr(0, 2); }
};
+#if defined(WIN32)
static std::vector<VisualStudioInstance> get_visual_studio_instances(const VcpkgPaths& paths)
{
const auto& fs = paths.get_filesystem();
@@ -745,6 +746,7 @@ namespace vcpkg::Commands::Fetch
return instances;
}
+#endif
#if defined(_WIN32)
std::vector<Toolset> find_toolset_instances_preferred_first(const VcpkgPaths& paths)