Skip to content
Snippets Groups Projects
Commit 9e064bf9 authored by Andreas Traczyk's avatar Andreas Traczyk
Browse files

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
parent bd9a2886
No related branches found
No related tags found
No related merge requests found
......@@ -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)
......
......@@ -14,8 +14,8 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment