From 07466440c4972b083c6f5cd276f4540ba9c5de6c Mon Sep 17 00:00:00 2001 From: John Emmas Date: Sat, 19 May 2018 09:28:30 +0100 Subject: [PATCH] Move a couple of #undef's 'pbd/timing.h' now includes a call to 'std::numeric_limits<>::max()' --- libs/pbd/pbd/timing.h | 5 +++++ libs/pbd/timing.cc | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libs/pbd/pbd/timing.h b/libs/pbd/pbd/timing.h index 470751f972..0cac0baef9 100644 --- a/libs/pbd/pbd/timing.h +++ b/libs/pbd/pbd/timing.h @@ -31,6 +31,11 @@ #include "pbd/libpbd_visibility.h" +#ifdef COMPILER_MSVC +#undef min +#undef max +#endif + namespace PBD { LIBPBD_API bool get_min_max_avg_total (const std::vector& values, uint64_t& min, uint64_t& max, uint64_t& avg, uint64_t& total); diff --git a/libs/pbd/timing.cc b/libs/pbd/timing.cc index 96b9701647..79c8e4aefe 100644 --- a/libs/pbd/timing.cc +++ b/libs/pbd/timing.cc @@ -22,11 +22,6 @@ #include #include -#ifdef COMPILER_MSVC -#undef min -#undef max -#endif - namespace PBD { bool -- 2.30.2