Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013

# Conflicts:
#	toolsrc/include/vcpkg/vcpkgpaths.h
#	toolsrc/src/vcpkg/vcpkgpaths.cpp

1 files changed, 0 insertions, 90 deletions

diff --git a/toolsrc/src/StatusParagraphs.cpp b/toolsrc/src/StatusParagraphs.cpp
deleted file mode 100644
index aaba95eb9..000000000
--- a/toolsrc/src/StatusParagraphs.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-#include "pch.h"
-
-#include "StatusParagraphs.h"
-#include "vcpkg_Checks.h"
-#include <algorithm>
-
-namespace vcpkg
-{
-    StatusParagraphs::StatusParagraphs() = default;
-
-    StatusParagraphs::StatusParagraphs(std::vector<std::unique_ptr<StatusParagraph>>&& ps)
-        : paragraphs(std::move(ps)){};
-
-    StatusParagraphs::const_iterator StatusParagraphs::find(const std::string& name, const Triplet& triplet) const
-    {
-        return std::find_if(begin(), end(), [&](const std::unique_ptr<StatusParagraph>& pgh) {
-            const PackageSpec& spec = pgh->package.spec;
-            return spec.name() == name && spec.triplet() == triplet;
-        });
-    }
-
-    StatusParagraphs::iterator StatusParagraphs::find(const std::string& name, const Triplet& triplet)
-    {
-        return std::find_if(begin(), end(), [&](const std::unique_ptr<StatusParagraph>& pgh) {
-            const PackageSpec& spec = pgh->package.spec;
-            return spec.name() == name && spec.triplet() == triplet;
-        });
-    }
-
-    std::vector<std::unique_ptr<StatusParagraph>*> StatusParagraphs::find_all(const std::string& name,
-                                                                              const Triplet& triplet)
-    {
-        std::vector<std::unique_ptr<StatusParagraph>*> spghs;
-        for (auto&& p : *this)
-        {
-            if (p->package.spec.name() == name && p->package.spec.triplet() == triplet)
-            {
-                spghs.emplace_back(&p);
-            }
-        }
-        return spghs;
-    }
-
-    StatusParagraphs::iterator StatusParagraphs::find(const std::string& name,
-                                                      const Triplet& triplet,
-                                                      const std::string& feature)
-    {
-        return std::find_if(begin(), end(), [&](const std::unique_ptr<StatusParagraph>& pgh) {
-            const PackageSpec& spec = pgh->package.spec;
-            return spec.name() == name && spec.triplet() == triplet && pgh->package.feature == feature;
-        });
-    }
-
-    StatusParagraphs::const_iterator StatusParagraphs::find_installed(const std::string& name,
-                                                                      const Triplet& triplet) const
-    {
-        const const_iterator it = find(name, triplet);
-        if (it != end() && (*it)->want == Want::INSTALL && (*it)->state == InstallState::INSTALLED)
-        {
-            return it;
-        }
-
-        return end();
-    }
-
-    StatusParagraphs::iterator StatusParagraphs::insert(std::unique_ptr<StatusParagraph> pgh)
-    {
-        Checks::check_exit(VCPKG_LINE_INFO, pgh != nullptr, "Inserted null paragraph");
-        const PackageSpec& spec = pgh->package.spec;
-        const auto ptr = find(spec.name(), spec.triplet(), pgh->package.feature);
-        if (ptr == end())
-        {
-            paragraphs.push_back(std::move(pgh));
-            return paragraphs.rbegin();
-        }
-
-        // consume data from provided pgh.
-        **ptr = std::move(*pgh);
-        return ptr;
-    }
-
-    void serialize(const StatusParagraphs& pghs, std::string& out_str)
-    {
-        for (auto& pgh : pghs.paragraphs)
-        {
-            serialize(*pgh, out_str);
-            out_str.push_back('\n');
-        }
-    }
-}