From 632aa29d9d1594475d942c0798d4d063df666d8f Mon Sep 17 00:00:00 2001
From: Bertrand Bellenot <bertrand.bellenot@cern.ch>
Date: Mon, 19 Apr 2021 12:09:08 +0200
Subject: [PATCH] [geom] Port to Win64 (replace Long_t by Longptr_t + pointer
formatting)
---
geom/geom/src/TGeoCache.cxx | 4 ++--
geom/geom/src/TGeoVolume.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/geom/geom/src/TGeoCache.cxx b/geom/geom/src/TGeoCache.cxx
index b00781e4f07..d1d57d1fc75 100644
--- a/geom/geom/src/TGeoCache.cxx
+++ b/geom/geom/src/TGeoCache.cxx
@@ -272,9 +272,9 @@ Int_t TGeoNodeCache::GetCurrentNodeId() const
Int_t TGeoNodeCache::GetNodeId() const
{
- Long_t id=0;
+ Longptr_t id=0;
for (Int_t level=0;level<fLevel+1; level++)
- id += (Long_t)fNodeBranch[level];
+ id += (Longptr_t)fNodeBranch[level];
return (Int_t)id;
}
diff --git a/geom/geom/src/TGeoVolume.cxx b/geom/geom/src/TGeoVolume.cxx
index 74c8f4ce076..bf422767711 100644
--- a/geom/geom/src/TGeoVolume.cxx
+++ b/geom/geom/src/TGeoVolume.cxx
@@ -1677,7 +1677,7 @@ Bool_t TGeoVolume::GetOptimalVoxels() const
char *TGeoVolume::GetPointerName() const
{
static TString name;
- name = TString::Format("p%s_%lx", GetName(), (ULong_t)this);
+ name = TString::Format("p%s_%zx", GetName(), (size_t)this);
return (char*)name.Data();
}
--
GitLab