From 431feab1bfb09b64e5b309b64e7517479073cad6 Mon Sep 17 00:00:00 2001 From: Nikolaj Bjorner Date: Thu, 11 May 2017 09:37:01 -0700 Subject: [PATCH] fix build warnings part 8 Signed-off-by: Nikolaj Bjorner --- src/util/lp/column_info.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/util/lp/column_info.h b/src/util/lp/column_info.h index ed916757d..56e75a1fb 100644 --- a/src/util/lp/column_info.h +++ b/src/util/lp/column_info.h @@ -15,26 +15,26 @@ inline bool is_valid(unsigned j) { return static_cast(j) >= 0;} template class column_info { std::string m_name; - bool m_low_bound_is_set; - bool m_low_bound_is_strict; - bool m_upper_bound_is_set; - bool m_upper_bound_is_strict; - T m_low_bound; - T m_upper_bound; - T m_cost; - T m_fixed_value; - bool m_is_fixed; - unsigned m_column_index; + bool m_low_bound_is_set; + bool m_low_bound_is_strict; + bool m_upper_bound_is_set; + bool m_upper_bound_is_strict; + T m_low_bound; + T m_upper_bound; + T m_fixed_value; + bool m_is_fixed; + T m_cost; + unsigned m_column_index; public: bool operator==(const column_info & c) const { - return m_name == c.m_name && + return m_name == c.m_name && m_low_bound_is_set == c.m_low_bound_is_set && m_low_bound_is_strict == c.m_low_bound_is_strict && m_upper_bound_is_set == c.m_upper_bound_is_set&& m_upper_bound_is_strict == c.m_upper_bound_is_strict&& (!m_low_bound_is_set || m_low_bound == c.m_low_bound) && (!m_upper_bound_is_set || m_upper_bound == c.m_upper_bound) && - m_cost == c.m_cost&& + m_cost == c.m_cost && m_is_fixed == c.m_is_fixed && (!m_is_fixed || m_fixed_value == c.m_fixed_value) && m_column_index == c.m_column_index;