aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-11-29 17:38:54 -0800
committerRobert Schumacher <roschuma@microsoft.com>2016-11-29 17:38:54 -0800
commit6479147c6e548e0436d4859e177d8dcb10249765 (patch)
treea19fbf64302e7d021c92fc317be8b27cdf0dadd7 /toolsrc/src
parenta07d94e1f08e65f946520e13beb58ef994bd4a01 (diff)
parentab147b838b79692b838e6d3cf794a8caef3e5629 (diff)
downloadvcpkg-6479147c6e548e0436d4859e177d8dcb10249765.tar.gz
vcpkg-6479147c6e548e0436d4859e177d8dcb10249765.zip
Merge branch 'master' into traversaro-add-freeimage
Diffstat (limited to 'toolsrc/src')
-rw-r--r--toolsrc/src/vcpkg.cpp13
1 files changed, 0 insertions, 13 deletions
diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp
index acebd57b9..b1fe76982 100644
--- a/toolsrc/src/vcpkg.cpp
+++ b/toolsrc/src/vcpkg.cpp
@@ -20,19 +20,6 @@ bool vcpkg::g_do_dry_run = false;
namespace
{
- template <class M, class K, class V>
- auto find_or_default(const M& map, const K& key, const V& val)
- {
- auto it = map.find(key);
- if (it == map.end())
- return decltype(it->second)(val);
- else
- return it->second;
- }
-}
-
-namespace
-{
std::fstream open_status_file(const vcpkg_paths& paths, std::ios_base::openmode mode = std::ios_base::app | std::ios_base::in | std::ios_base::out | std::ios_base::binary)
{
return std::fstream(paths.vcpkg_dir_status_file, mode);