From b326f819abf0cd1aeb0993a9801fcdca2c960dfd Mon Sep 17 00:00:00 2001 From: Simon Rozman Date: Mon, 11 Sep 2023 16:44:30 +0200 Subject: [PATCH] Fix to compile using XCode Signed-off-by: Simon Rozman --- include/stdex/sal.hpp | 6 ++++++ include/stdex/stream.hpp | 22 +++++++++++----------- include/stdex/system.hpp | 8 ++++---- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/include/stdex/sal.hpp b/include/stdex/sal.hpp index cdae469e1..9c17d5090 100644 --- a/include/stdex/sal.hpp +++ b/include/stdex/sal.hpp @@ -92,3 +92,9 @@ #else #define _Deprecated_(message) [[deprecated(message)]] #endif + +#ifdef _WIN32 +#define _Unreferenced_(x) UNREFERENCED_PARAMETER(x) +#else +#define _Unreferenced_(x) +#endif diff --git a/include/stdex/stream.hpp b/include/stdex/stream.hpp index 794b5957a..a5e6cb1da 100644 --- a/include/stdex/stream.hpp +++ b/include/stdex/stream.hpp @@ -87,8 +87,8 @@ namespace stdex virtual _Success_(return != 0 || length == 0) size_t read( _Out_writes_bytes_to_opt_(length, return) void* data, _In_ size_t length) { - UNREFERENCED_PARAMETER(data); - UNREFERENCED_PARAMETER(length); + _Unreferenced_(data); + _Unreferenced_(length); m_state = state_t::fail; return 0; } @@ -105,8 +105,8 @@ namespace stdex virtual _Success_(return != 0) size_t write( _In_reads_bytes_opt_(length) const void* data, _In_ size_t length) { - UNREFERENCED_PARAMETER(data); - UNREFERENCED_PARAMETER(length); + _Unreferenced_(data); + _Unreferenced_(length); m_state = state_t::fail; return 0; } @@ -753,8 +753,8 @@ namespace stdex /// virtual void lock(_In_ fpos_t offset, _In_ fsize_t length) { - UNREFERENCED_PARAMETER(offset); - UNREFERENCED_PARAMETER(length); + _Unreferenced_(offset); + _Unreferenced_(length); throw std::exception("not implemented"); } @@ -763,8 +763,8 @@ namespace stdex /// virtual void unlock(_In_ fpos_t offset, _In_ fsize_t length) { - UNREFERENCED_PARAMETER(offset); - UNREFERENCED_PARAMETER(length); + _Unreferenced_(offset); + _Unreferenced_(length); throw std::exception("not implemented"); } @@ -808,7 +808,7 @@ namespace stdex /// virtual void set_ctime(time_point date) { - UNREFERENCED_PARAMETER(date); + _Unreferenced_(date); throw std::exception("not implemented"); } @@ -817,7 +817,7 @@ namespace stdex /// virtual void set_atime(time_point date) { - UNREFERENCED_PARAMETER(date); + _Unreferenced_(date); throw std::exception("not implemented"); } @@ -826,7 +826,7 @@ namespace stdex /// virtual void set_mtime(time_point date) { - UNREFERENCED_PARAMETER(date); + _Unreferenced_(date); throw std::exception("not implemented"); } diff --git a/include/stdex/system.hpp b/include/stdex/system.hpp index 5a62fc05e..d23352d4b 100644 --- a/include/stdex/system.hpp +++ b/include/stdex/system.hpp @@ -1,4 +1,4 @@ -/* +/* SPDX-License-Identifier: MIT Copyright © 2023 Amebis */ @@ -136,12 +136,12 @@ namespace stdex /// /// Closes object /// - static void close(sys_handle h) + static void close(_In_ sys_handle h) { #ifdef _WIN32 if (CloseHandle(h) || GetLastError() == ERROR_INVALID_HANDLE) #else - if (close(h) >= 0 || errno == EBADF) + if (::close(h) >= 0 || errno == EBADF) #endif return; throw std::runtime_error("failed to close handle"); @@ -157,7 +157,7 @@ namespace stdex HANDLE process = GetCurrentProcess(); if (DuplicateHandle(process, h, process, &h_new, 0, inherit, DUPLICATE_SAME_ACCESS)) #else - UNREFERENCED_PARAMETER(inherit); + _Unreferenced_(inherit); if ((h_new = dup(h)) >= 0) #endif return h_new;