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, 20 deletions

diff --git a/toolsrc/src/PackageSpecParseResult.cpp b/toolsrc/src/PackageSpecParseResult.cpp
deleted file mode 100644
index 838c788ba..000000000
--- a/toolsrc/src/PackageSpecParseResult.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "pch.h"
-
-#include "PackageSpecParseResult.h"
-#include "vcpkg_Checks.h"
-
-namespace vcpkg
-{
-    CStringView to_string(PackageSpecParseResult ev) noexcept
-    {
-        switch (ev)
-        {
-            case PackageSpecParseResult::SUCCESS: return "OK";
-            case PackageSpecParseResult::TOO_MANY_COLONS: return "Too many colons";
-            case PackageSpecParseResult::INVALID_CHARACTERS:
-                return "Contains invalid characters. Only alphanumeric lowercase ASCII characters and dashes are "
-                       "allowed";
-            default: Checks::unreachable(VCPKG_LINE_INFO);
-        }
-    }
-}