From 9a86ffeb7ee16feb4a696c44ec68bc966fd664f6 Mon Sep 17 00:00:00 2001 From: ski Date: Thu, 17 Apr 2014 19:16:58 +0400 Subject: [PATCH] 0024843: CLang warnings -Wconstant-logical-operand Logical expression is corrected to take into account input argument --- src/TopOpeBRepTool/TopOpeBRepTool_makeTransition.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/TopOpeBRepTool/TopOpeBRepTool_makeTransition.cxx b/src/TopOpeBRepTool/TopOpeBRepTool_makeTransition.cxx index 9476f491ad..76aca09b9b 100644 --- a/src/TopOpeBRepTool/TopOpeBRepTool_makeTransition.cxx +++ b/src/TopOpeBRepTool/TopOpeBRepTool_makeTransition.cxx @@ -262,14 +262,14 @@ static Standard_Boolean FUN_mkT2dquad(const TopoDS_Edge& e1,const Standard_Real // = sta = state of point on e1 after pt / e2 gp_Dir tga1,tga2; - Standard_Boolean mk1 = isINifh1 || isON2ifss || isIN2ifss; + Standard_Boolean mk1 = (mkt==isINifh1) || (mkt==isON2ifss) || (mkt==isIN2ifss); if (mk1) { Standard_Integer st1 = 0; gp_Dir tgnear1; Standard_Boolean ok = FUN_tg(e1,par1,f1,l1,factor,tgnear1,st1); if (!ok) return Standard_False; tga1 = (st1 == AFTER) ? tgnear1 : tgnear1.Reversed(); } - Standard_Boolean mk2 = isINifh2 || isON2ifss || isOU2ifss; + Standard_Boolean mk2 = (mkt==isINifh2) || (mkt==isON2ifss) || (mkt==isOU2ifss); if (mk2) { Standard_Real f2,l2; FUN_tool_bounds(e2,f2,l2); Standard_Integer st2 = 0; gp_Dir tgnear2;