From 83cde513345f5544325520b89ec3f1f27bd8b2a6 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 3 Apr 2017 14:47:30 -0700 Subject: package_spec_parse_result -> PackageSpecParseResult --- toolsrc/include/PackageSpec.h | 2 +- toolsrc/include/PackageSpecParseResult.h | 36 +++++++++++++++++++++++++++++ toolsrc/include/package_spec_parse_result.h | 36 ----------------------------- 3 files changed, 37 insertions(+), 37 deletions(-) create mode 100644 toolsrc/include/PackageSpecParseResult.h delete mode 100644 toolsrc/include/package_spec_parse_result.h (limited to 'toolsrc/include') diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index be966478b..4efd7a9ed 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -1,5 +1,5 @@ #pragma once -#include "package_spec_parse_result.h" +#include "PackageSpecParseResult.h" #include "triplet.h" #include "vcpkg_expected.h" diff --git a/toolsrc/include/PackageSpecParseResult.h b/toolsrc/include/PackageSpecParseResult.h new file mode 100644 index 000000000..c3072ea2a --- /dev/null +++ b/toolsrc/include/PackageSpecParseResult.h @@ -0,0 +1,36 @@ +#pragma once +#include + +namespace vcpkg +{ + enum class PackageSpecParseResult + { + SUCCESS = 0, + TOO_MANY_COLONS, + INVALID_CHARACTERS + }; + + struct PackageSpecParseResultCategoryImpl final : std::error_category + { + virtual const char* name() const noexcept override; + + virtual std::string message(int ev) const noexcept override; + }; + + const std::error_category& package_spec_parse_result_category(); + + std::error_code make_error_code(PackageSpecParseResult e); + + PackageSpecParseResult to_package_spec_parse_result(int i); + + PackageSpecParseResult to_package_spec_parse_result(std::error_code ec); +} + +// Enable implicit conversion to std::error_code +namespace std +{ + template <> + struct is_error_code_enum : ::std::true_type + { + }; +} diff --git a/toolsrc/include/package_spec_parse_result.h b/toolsrc/include/package_spec_parse_result.h deleted file mode 100644 index 5735c4f4c..000000000 --- a/toolsrc/include/package_spec_parse_result.h +++ /dev/null @@ -1,36 +0,0 @@ -#pragma once -#include - -namespace vcpkg -{ - enum class package_spec_parse_result - { - SUCCESS = 0, - TOO_MANY_COLONS, - INVALID_CHARACTERS - }; - - struct package_spec_parse_result_category_impl final : std::error_category - { - virtual const char* name() const noexcept override; - - virtual std::string message(int ev) const noexcept override; - }; - - const std::error_category& package_spec_parse_result_category(); - - std::error_code make_error_code(package_spec_parse_result e); - - package_spec_parse_result to_package_spec_parse_result(int i); - - package_spec_parse_result to_package_spec_parse_result(std::error_code ec); -} - -// Enable implicit conversion to std::error_code -namespace std -{ - template <> - struct is_error_code_enum : ::std::true_type - { - }; -} -- cgit v1.2.3