From 0d48c37d9eabde54c3bb2efc6fad45a2f89c8a84 Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 14 May 2008 10:02:37 +0000
Subject: [PATCH] Fix a compilation warning geom\geom\src\TGeoBoolNode.cxx(825)
: warning C4804: '~' : unsafe use of type 'bool' in operation
geom\geom\src\TGeoBoolNode.cxx(825) : warning C4805: '&' : unsafe mix of type
'Bool_t' and type 'int' in operation
git-svn-id: http://root.cern.ch/svn/root/trunk@23839 27541ba8-7e3a-0410-8455-c3a389f83636
---
geom/geom/src/TGeoBoolNode.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/geom/geom/src/TGeoBoolNode.cxx b/geom/geom/src/TGeoBoolNode.cxx
index ca61ad95251..b571456fbc3 100644
--- a/geom/geom/src/TGeoBoolNode.cxx
+++ b/geom/geom/src/TGeoBoolNode.cxx
@@ -822,7 +822,7 @@ Double_t TGeoSubtraction::Safety(Double_t *point, Bool_t in) const
Bool_t in1 = fLeft->Contains(local1);
fRightMat->MasterToLocal(point,local2);
Bool_t in2 = fRight->Contains(local2);
- Bool_t intrue = in1 & (~in2);
+ Bool_t intrue = in1 && (!in2);
if (in^intrue) return 0.0;
Double_t saf1 = fLeft->Safety(local1, in1);
Double_t saf2 = fRight->Safety(local2, in2);
--
GitLab