From 8c8ef391f89d87951f5d319cb75d1e327cfcf340 Mon Sep 17 00:00:00 2001 From: eidheim Date: Fri, 30 Dec 2016 10:19:21 +0100 Subject: [PATCH] Fixed DEPRECATED macro in cases where it is already defined --- server_http.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server_http.hpp b/server_http.hpp index 83e2739..e5fae19 100644 --- a/server_http.hpp +++ b/server_http.hpp @@ -21,6 +21,7 @@ #endif // TODO when switching to c++14, use [[deprecated]] instead +#ifndef DEPRECATED #ifdef __GNUC__ #define DEPRECATED __attribute__((deprecated)) #elif defined(_MSC_VER) @@ -28,6 +29,7 @@ #else #define DEPRECATED #endif +#endif namespace SimpleWeb { template