From 3b5546cfceee6ef0ca9d8bc13f5a74b7ff21782f Mon Sep 17 00:00:00 2001 From: John Emmas Date: Thu, 18 Jun 2020 12:46:05 +0100 Subject: [PATCH] Partially revert commit #23feb0491e For MSVC, the 'using std::' statements are needed when building anything which #includes 'pbd/controllable.h' (never quite figured out why...) --- libs/pbd/pbd/controllable.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h index 079d922a48..af3f7b4825 100644 --- a/libs/pbd/pbd/controllable.h +++ b/libs/pbd/pbd/controllable.h @@ -34,6 +34,9 @@ #include "pbd/statefuldestructible.h" +using std::min; +using std::max; + class XMLNode; namespace PBD { @@ -132,7 +135,7 @@ public: virtual float get_interface(bool rotary=false) const { return (internal_to_interface(get_value(), rotary)); } virtual void set_interface (float fraction, bool rotary=false, GroupControlDisposition gcd = NoGroup) { - fraction = std::min (std::max (0.0f, fraction), 1.0f); + fraction = min (max (0.0f, fraction), 1.0f); set_value (interface_to_internal (fraction, rotary), gcd); }