From e30de50178ae7c3f9eb95a6ad10538df86a7ca2b Mon Sep 17 00:00:00 2001
From: Markus Frank <Markus.Frank@cern.ch>
Date: Thu, 14 Jul 2022 18:28:38 +0200
Subject: [PATCH] Improve component property handling. Add property test
---
DDCore/include/DD4hep/GrammarParsed.h | 8 ++++----
DDCore/src/GrammarTypes.cpp | 9 +++------
examples/ClientTests/src/Property_test.cpp | 1 +
3 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/DDCore/include/DD4hep/GrammarParsed.h b/DDCore/include/DD4hep/GrammarParsed.h
index 45509c693..83e1cc8db 100644
--- a/DDCore/include/DD4hep/GrammarParsed.h
+++ b/DDCore/include/DD4hep/GrammarParsed.h
@@ -26,10 +26,10 @@
#endif
/// Framework include files
-#include <DD4hep/Grammar.h>
-#include <DD4hep/Printout.h>
-#include <Parsers/Parsers.h>
-#include <Evaluator/Evaluator.h>
+#include "DD4hep/Grammar.h"
+#include "DD4hep/Printout.h"
+#include "Parsers/Parsers.h"
+#include "Evaluator/Evaluator.h"
/// C/C++ include files
#include <string>
diff --git a/DDCore/src/GrammarTypes.cpp b/DDCore/src/GrammarTypes.cpp
index 53d59c176..33ebbbc77 100644
--- a/DDCore/src/GrammarTypes.cpp
+++ b/DDCore/src/GrammarTypes.cpp
@@ -14,12 +14,9 @@
// Framework include files
#include <DD4hep/GrammarParsed.h>
-#ifndef DD4HEP_PARSERS_NO_ROOT
-
-/// ROOT include files
-#include <Math/Point3D.h>
-#include <Math/Vector4D.h>
-#include <Math/Vector3D.h>
+#include "Math/Point3D.h"
+#include "Math/Vector4D.h"
+#include "Math/Vector3D.h"
namespace ROOT {
namespace Math {
diff --git a/examples/ClientTests/src/Property_test.cpp b/examples/ClientTests/src/Property_test.cpp
index 46dc6e9e9..3203f6c8b 100644
--- a/examples/ClientTests/src/Property_test.cpp
+++ b/examples/ClientTests/src/Property_test.cpp
@@ -219,6 +219,7 @@ static int property_test(Detector& /* description */, int /* argc */, char** /*
cout << endl << "Test PASSED" << endl << endl;
else
cout << endl << "Test FAILED" << endl << "===> " << result << " Subtests FAILED" << endl;
+
// All done.
return 1;
}
--
GitLab