From 004c85b34f5fd6504f7202f75b5dfe8ce050b439 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Thu, 7 Oct 2010 14:08:57 +0000
Subject: [PATCH] fix clang warning (use of logical || with constant operand;
switch to bitwise | or remove constant).
git-svn-id: http://root.cern.ch/svn/root/trunk@36156 27541ba8-7e3a-0410-8455-c3a389f83636
---
graf2d/x11/src/TGX11.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/graf2d/x11/src/TGX11.cxx b/graf2d/x11/src/TGX11.cxx
index f080ea79112..865b61bfd02 100644
--- a/graf2d/x11/src/TGX11.cxx
+++ b/graf2d/x11/src/TGX11.cxx
@@ -2721,7 +2721,7 @@ void TGX11::SetRGB(int cindex, float r, float g, float b)
xcol.red = (UShort_t)(r * kBIGGEST_RGB_VALUE);
xcol.green = (UShort_t)(g * kBIGGEST_RGB_VALUE);
xcol.blue = (UShort_t)(b * kBIGGEST_RGB_VALUE);
- xcol.flags = DoRed || DoGreen || DoBlue;
+ xcol.flags = DoRed | DoGreen | DoBlue;
XColor_t &col = GetColor(cindex);
if (col.fDefined) {
// if color is already defined with same rgb just return
@@ -2734,7 +2734,7 @@ void TGX11::SetRGB(int cindex, float r, float g, float b)
}
if (AllocColor(fColormap, &xcol)) {
col.fDefined = kTRUE;
- col.fPixel = xcol.pixel;
+ col.fPixel = xcol.pixel;
col.fRed = xcol.red;
col.fGreen = xcol.green;
col.fBlue = xcol.blue;
--
GitLab