diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-31 17:19:03 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-03-31 17:19:03 -0700 |
| commit | 31e55704f5854b27d80e93576f182342f6e73707 (patch) | |
| tree | 2295064549018b2077d5b90a518c46d2c9cf00eb /toolsrc/include | |
| parent | 095d3294d583b4fb2f72d69f9e8f67c3582715ef (diff) | |
| download | vcpkg-31e55704f5854b27d80e93576f182342f6e73707.tar.gz vcpkg-31e55704f5854b27d80e93576f182342f6e73707.zip | |
Use [[noreturn]] instead of declspec(noreturn)
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg_Checks.h | 18 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg_Enums.h | 3 |
2 files changed, 14 insertions, 7 deletions
diff --git a/toolsrc/include/vcpkg_Checks.h b/toolsrc/include/vcpkg_Checks.h index 1e2c7243e..5bcc59fee 100644 --- a/toolsrc/include/vcpkg_Checks.h +++ b/toolsrc/include/vcpkg_Checks.h @@ -5,25 +5,31 @@ namespace vcpkg::Checks { - __declspec(noreturn) void unreachable(const LineInfo& line_info); + [[noreturn]] + void unreachable(const LineInfo& line_info); - _declspec(noreturn) void exit_with_code(const LineInfo& line_info, const int exit_code); + [[noreturn]] + void exit_with_code(const LineInfo& line_info, const int exit_code); - _declspec(noreturn) inline void exit_fail(const LineInfo& line_info) + [[noreturn]] + inline void exit_fail(const LineInfo& line_info) { exit_with_code(line_info, EXIT_FAILURE); } - _declspec(noreturn) inline void exit_success(const LineInfo& line_info) + [[noreturn]] + inline void exit_success(const LineInfo& line_info) { exit_with_code(line_info, EXIT_SUCCESS); } // Part of the reason these exist is to not include extra headers in this one to avoid circular #includes. - _declspec(noreturn) void exit_with_message(const LineInfo& line_info, const cstring_view errorMessage); + [[noreturn]] + void exit_with_message(const LineInfo& line_info, const cstring_view errorMessage); template <class Arg1, class...Args> - _declspec(noreturn) void exit_with_message(const LineInfo& line_info, const char* errorMessageTemplate, const Arg1 errorMessageArg1, const Args&... errorMessageArgs) + [[noreturn]] + void exit_with_message(const LineInfo& line_info, const char* errorMessageTemplate, const Arg1 errorMessageArg1, const Args&... errorMessageArgs) { exit_with_message(line_info, Strings::format(errorMessageTemplate, errorMessageArg1, errorMessageArgs...)); } diff --git a/toolsrc/include/vcpkg_Enums.h b/toolsrc/include/vcpkg_Enums.h index ef41155d9..4669e4289 100644 --- a/toolsrc/include/vcpkg_Enums.h +++ b/toolsrc/include/vcpkg_Enums.h @@ -6,5 +6,6 @@ namespace vcpkg::Enums { std::string nullvalue_toString(const std::string& enum_name); - __declspec(noreturn) void nullvalue_used(const LineInfo& line_info, const std::string& enum_name); + [[noreturn]] + void nullvalue_used(const LineInfo& line_info, const std::string& enum_name); } |