jyapayne/Simple-Web-Server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed DEPRECATED to SW_DEPRECATED to avoid name conflicts

Browse source
This commit is contained in:
eidheim 2022-05-31 15:12:14 +02:00
commit c52ebc2e60
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
server_http.hpp
View file

@ -252,7 +252,7 @@ namespace SimpleWeb {
} }
/// Deprecated, please use remote_endpoint().address().to_string() instead. /// 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 { try {
if(auto connection = this->connection.lock()) if(auto connection = this->connection.lock())
return connection->socket->lowest_layer().remote_endpoint().address().to_string(); return connection->socket->lowest_layer().remote_endpoint().address().to_string();
@ -263,7 +263,7 @@ namespace SimpleWeb {
} }
/// Deprecated, please use remote_endpoint().port() instead. /// 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 { try {
if(auto connection = this->connection.lock()) if(auto connection = this->connection.lock())
return connection->socket->lowest_layer().remote_endpoint().port(); return connection->socket->lowest_layer().remote_endpoint().port();

8
utility.hpp
View file

@ -12,13 +12,13 @@
#include <string> #include <string>
#include <unordered_map> #include <unordered_map>
#ifndef DEPRECATED #ifndef SW_DEPRECATED
#if defined(__GNUC__) || defined(__clang__) #if defined(__GNUC__) || defined(__clang__)
#define DEPRECATED __attribute__((deprecated)) #define SW_DEPRECATED __attribute__((deprecated))
#elif defined(_MSC_VER) #elif defined(_MSC_VER)
#define DEPRECATED __declspec(deprecated) #define SW_DEPRECATED __declspec(deprecated)
#else #else
#define DEPRECATED #define SW_DEPRECATED
#endif #endif
#endif #endif