From ee3efaf36b54f5c8564577d7f04e013de88d3f0c Mon Sep 17 00:00:00 2001 From: freem Date: Sat, 26 Jul 2014 19:00:50 -0500 Subject: [PATCH] we dropped Visual C++ 6 support a long time ago, so remove most of the boolean operator hacks. However, the == one is still required (at least on Visual Studio 2008, not sure about others). Feel free to revert this if it's causing problems elsewhere. --- src/ThemeMetric.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/ThemeMetric.h b/src/ThemeMetric.h index 41ac59667e..f74d1c4e0b 100644 --- a/src/ThemeMetric.h +++ b/src/ThemeMetric.h @@ -170,10 +170,12 @@ public: bool IsLoaded() const { return m_Value.IsSet(); } // Hacks for VC6 for all boolean operators. - // todo: get rid of these -aj - bool operator ! () const { return !GetValue(); } - bool operator && ( const T& input ) const { return GetValue() && input; } - bool operator || ( const T& input ) const { return GetValue() || input; } + // These three no longer appear to be required: + //bool operator ! () const { return !GetValue(); } + //bool operator && ( const T& input ) const { return GetValue() && input; } + //bool operator || ( const T& input ) const { return GetValue() || input; } + + // This one is still required in at least Visual Studio 2008: bool operator == ( const T& input ) const { return GetValue() == input; } };