Skip to content

Commit

Permalink
Avoid msvc macro redefinition
Browse files Browse the repository at this point in the history
  • Loading branch information
Jackarain committed Jul 29, 2024
1 parent 08daf90 commit b866aa1
Showing 1 changed file with 8 additions and 0 deletions.
8 changes: 8 additions & 0 deletions server/proxy_server/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ namespace po = boost::program_options;
#include "proxy/use_awaitable.hpp"
#include "proxy/ipip.hpp"

#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable: 4005)
#endif // _MSC_VER

#ifdef USE_SNMALLOC
# define NO_BOOTSTRAP_ALLOCATOR
# ifndef NDEBUG
Expand All @@ -35,6 +40,9 @@ namespace po = boost::program_options;
# include "src/snmalloc/override/new.cc"
#endif // USE_SNMALLOC

#ifdef _MSC_VER
# pragma warning(pop)
#endif

#include "main.hpp"

Expand Down

0 comments on commit b866aa1

Please sign in to comment.