From a6afac67ee03bb5bbaff9202bad8d2ade1b30550 Mon Sep 17 00:00:00 2001
From: Markus Frank <markus.frank@cern.ch>
Date: Fri, 25 Apr 2014 09:15:20 +0000
Subject: [PATCH] Fix compile error on MAC
---
DDCore/include/DD4hep/Detector.h | 2 +-
DDCore/include/DD4hep/VolumeManager.h | 2 +-
DDCore/src/VolumeManager.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/DDCore/include/DD4hep/Detector.h b/DDCore/include/DD4hep/Detector.h
index 06ecf1a8c..d83f57f58 100644
--- a/DDCore/include/DD4hep/Detector.h
+++ b/DDCore/include/DD4hep/Detector.h
@@ -344,7 +344,7 @@ namespace DD4hep {
/// Extend the detector element with an arbitrary callback
template <typename Q, typename T>
void callAtUpdate(unsigned int type, Q* pointer,
- void (T::*pmf)(unsigned int typ, DetElement& det, void* opt_par)) const
+ void (T::*pmf)(unsigned long typ, DetElement& det, void* opt_par)) const
{
CallbackSequence::checkTypes(typeid(T), typeid(Q), dynamic_cast<T*>(pointer));
i_addUpdateCall(type, Callback(pointer).make(pmf));
diff --git a/DDCore/include/DD4hep/VolumeManager.h b/DDCore/include/DD4hep/VolumeManager.h
index 18a9eae3a..86ff95afe 100644
--- a/DDCore/include/DD4hep/VolumeManager.h
+++ b/DDCore/include/DD4hep/VolumeManager.h
@@ -160,7 +160,7 @@ namespace DD4hep {
/// Search the locally cached volumes for a matching ID
Context* search(const VolumeID& id) const;
/// Update callback when alignment has changed (called only for subdetectors....)
- void update(unsigned int tags, DetElement& det, void* param);
+ void update(unsigned long tags, DetElement& det, void* param);
};
protected:
diff --git a/DDCore/src/VolumeManager.cpp b/DDCore/src/VolumeManager.cpp
index 46d1ea810..1266898f3 100644
--- a/DDCore/src/VolumeManager.cpp
+++ b/DDCore/src/VolumeManager.cpp
@@ -241,7 +241,7 @@ VolumeManager::Object::~Object() {
}
/// Update callback when alignment has changed (called only for subdetectors....)
-void VolumeManager::Object::update(unsigned int tags, DetElement& det, void* param) {
+void VolumeManager::Object::update(unsigned long tags, DetElement& det, void* param) {
if ( DetElement::CONDITIONS_CHANGED == (tags&DetElement::CONDITIONS_CHANGED) )
printout(INFO,"VolumeManager","+++ Conditions update %s param:%p",det.path().c_str(),param);
if ( DetElement::PLACEMENT_CHANGED == (tags&DetElement::PLACEMENT_CHANGED) )
--
GitLab