From 9e064bf993e8fa87609ce756f035a59d925efb70 Mon Sep 17 00:00:00 2001 From: Andreas Traczyk Date: Thu, 5 Sep 2024 16:10:11 -0400 Subject: [PATCH] mapping: define NOMINMAX to prevent breakage for foo::max() sys_clock::time_point::max() is now used and without NOMINMAX, max is defined as a macro in a common Windows header. This commit defines NOMINMAX in the CMakeLists.txt and removes some commented code in mapping.cpp. Gitlab: #41 Change-Id: I98654cbafd362417d61734c4389b11ed68ff8dd8 --- CMakeLists.txt | 4 +++- src/upnp/protocol/mapping.cpp | 8 +------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d8e0c79..64c1b6d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -131,7 +131,9 @@ else() -DMSGPACK_DISABLE_LEGACY_NIL \ -DMSGPACK_DISABLE_LEGACY_CONVERT \ -DUNICODE \ - -D_UNICODE") + -D_UNICODE \ + -DNOMINMAX \ + ") endif() if (DNC_SYSTEMD AND BUILD_TOOLS AND NOT MSVC) diff --git a/src/upnp/protocol/mapping.cpp b/src/upnp/protocol/mapping.cpp index fa9b6c73..7e3c0366 100644 --- a/src/upnp/protocol/mapping.cpp +++ b/src/upnp/protocol/mapping.cpp @@ -14,8 +14,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #include "upnp/mapping.h" -// #include "logger.h" #include "igd.h" namespace dhtnet { @@ -63,7 +63,6 @@ void Mapping::updateFrom(const Mapping& other) { if (type_ != other.type_) { - // JAMI_ERR("The source and destination types must match"); return; } @@ -77,11 +76,6 @@ Mapping::updateFrom(const Mapping& other) void Mapping::setAvailable(bool val) { - // JAMI_DBG("Changing mapping %s state from %s to %s", - // toString().c_str(), - // available_ ? "AVAILABLE" : "UNAVAILABLE", - // val ? "AVAILABLE" : "UNAVAILABLE"); - std::lock_guard lock(mutex_); available_ = val; }