Commit c52ebc2e authored by Ole Christian Eidheim's avatar Ole Christian Eidheim
Browse files

Renamed DEPRECATED to SW_DEPRECATED to avoid name conflicts

parent 8598036b

server_http.hpp

+2 −2
Original line number Diff line number Diff line
@@ -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();

utility.hpp

+4 −4
Original line number Diff line number Diff line
@@ -12,13 +12,13 @@ 
#include <string>

#include <unordered_map>



#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