From 5c1b082f0dbc042697970fcb51092f5ba76df8b3 Mon Sep 17 00:00:00 2001
From: Frank Gaede <frank.gaede@desy.de>
Date: Thu, 12 Mar 2015 17:32:08 +0000
Subject: [PATCH] - started to fix MAC OS issues - not complete yet...
---
DDG4/src/ComponentProperties.cpp | 11 +++++++++++
DDG4/src/Geant4Handle.cpp | 13 +++++++++----
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/DDG4/src/ComponentProperties.cpp b/DDG4/src/ComponentProperties.cpp
index 59f1ee493..81cf9304c 100644
--- a/DDG4/src/ComponentProperties.cpp
+++ b/DDG4/src/ComponentProperties.cpp
@@ -214,8 +214,19 @@ void PropertyManager::dump() const {
#include "Math/Point3D.h"
#include "Math/Vector3D.h"
#include "Math/Vector4D.h"
+#include "DD4hep/objects/BasicGrammar_inl.h"
+
+DD4HEP_DEFINE_PARSER_GRAMMAR_TYPE(Property)
namespace DD4hep {
+
+ //DD4HEP_DEFINE_PROPERTY_TYPE(Property);
+ template Property Property::value() const;
+ template void Property::value(Property& value) const;
+ template void Property::set(const Property& value);
+ template void Property::make(Property& value);
+
+
DD4HEP_DEFINE_PROPERTY_U_CONT(char);
DD4HEP_DEFINE_PROPERTY_U_CONT(short);
DD4HEP_DEFINE_PROPERTY_U_CONT(int);
diff --git a/DDG4/src/Geant4Handle.cpp b/DDG4/src/Geant4Handle.cpp
index 64bd95f8a..5399c2846 100644
--- a/DDG4/src/Geant4Handle.cpp
+++ b/DDG4/src/Geant4Handle.cpp
@@ -31,6 +31,10 @@ using namespace std;
using namespace DD4hep;
using namespace DD4hep::Simulation;
+namespace DD4hep {
+ namespace Simulation {
+
+
template <typename TYPE> static inline TYPE* checked_value(TYPE* p) {
if (p) {
return p;
@@ -182,8 +186,8 @@ template <typename TYPE> Geant4Handle<TYPE>& Geant4Handle<TYPE>::operator=(TYPE*
return *this;
}
-namespace DD4hep {
- namespace Simulation {
+//namespace DD4hep {
+// namespace Simulation {
KernelHandle::KernelHandle() {
value = &Geant4Kernel::instance(Geometry::LCDD::getInstance());
@@ -216,8 +220,7 @@ namespace DD4hep {
format("Geant4Handle<Geant4Sensitive>", "Failed to create sensitive object of type %s for detector %s!",
type_name.c_str(), detector.c_str()));
}
- }
-}
+
template class Geant4Handle<Geant4Action> ;
template class Geant4Handle<Geant4Filter> ;
@@ -240,3 +243,5 @@ template class Geant4Handle<Geant4TrackingActionSequence> ;
template class Geant4Handle<Geant4SteppingActionSequence> ;
template class Geant4Handle<Geant4StackingActionSequence> ;
template class Geant4Handle<Geant4SensDetActionSequence> ;
+ }
+}
--
GitLab