From c52ebc2e601c2187708c9909968212b9407ce1aa Mon Sep 17 00:00:00 2001 From: eidheim Date: Tue, 31 May 2022 15:12:14 +0200 Subject: [PATCH] Renamed DEPRECATED to SW_DEPRECATED to avoid name conflicts --- server_http.hpp | 4 ++-- utility.hpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server_http.hpp b/server_http.hpp index b0729a8..7cdc904 100644 --- a/server_http.hpp +++ b/server_http.hpp @@ -252,7 +252,7 @@ namespace SimpleWeb { } /// Deprecated, please use remote_endpoint().address().to_string() instead. - DEPRECATED std::string remote_endpoint_address() const noexcept { + SW_DEPRECATED std::string remote_endpoint_address() const noexcept { try { if(auto connection = this->connection.lock()) return connection->socket->lowest_layer().remote_endpoint().address().to_string(); @@ -263,7 +263,7 @@ namespace SimpleWeb { } /// Deprecated, please use remote_endpoint().port() instead. - DEPRECATED unsigned short remote_endpoint_port() const noexcept { + SW_DEPRECATED unsigned short remote_endpoint_port() const noexcept { try { if(auto connection = this->connection.lock()) return connection->socket->lowest_layer().remote_endpoint().port(); diff --git a/utility.hpp b/utility.hpp index d9119de..cac7dfa 100644 --- a/utility.hpp +++ b/utility.hpp @@ -12,13 +12,13 @@ #include #include -#ifndef DEPRECATED +#ifndef SW_DEPRECATED #if defined(__GNUC__) || defined(__clang__) -#define DEPRECATED __attribute__((deprecated)) +#define SW_DEPRECATED __attribute__((deprecated)) #elif defined(_MSC_VER) -#define DEPRECATED __declspec(deprecated) +#define SW_DEPRECATED __declspec(deprecated) #else -#define DEPRECATED +#define SW_DEPRECATED #endif #endif