From 8af9f7ae5956fb776e65852b5e946ef6f4b4501c Mon Sep 17 00:00:00 2001
From: Andre Sailer <andre.philippe.sailer@cern.ch>
Date: Mon, 15 Aug 2022 17:29:30 +0200
Subject: [PATCH] HeaderGuards: fixes

---
 DDCAD/include/DDCAD/OutputWriter.h             | 7 ++++---
 DDCore/include/DD4hep/DetType.h                | 2 ++
 DDCore/include/DD4hep/GrammarParsed.h          | 6 +++---
 DDCore/include/DD4hep/GrammarUnparsed.h        | 6 +++---
 DDCore/include/XML/UnicodeValues.h             | 2 +-
 DDG4/include/DDG4/Geant4FastSimHandler.h       | 2 +-
 DDG4/include/DDG4/Geant4FastSimShowerModel.h   | 2 +-
 DDG4/include/DDG4/Geant4HitHandler.h           | 2 +-
 DDParsers/include/Evaluator/detail/Evaluator.h | 6 +++---
 9 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/DDCAD/include/DDCAD/OutputWriter.h b/DDCAD/include/DDCAD/OutputWriter.h
index 8640646c1..9e47b47f1 100644
--- a/DDCAD/include/DDCAD/OutputWriter.h
+++ b/DDCAD/include/DDCAD/OutputWriter.h
@@ -10,8 +10,8 @@
 // Author     : M.Frank
 //
 //==========================================================================
-#ifndef DDCAD_INPUTWRITER_H
-#define DDCAD_INPUTWRITER_H
+#ifndef DDCAD_OUTPUTWRITER_H
+#define DDCAD_OUTPUTWRITER_H
 
 // Framework include files
 #include <DD4hep/config.h>
@@ -64,4 +64,5 @@ namespace dd4hep {
     
   }        /* End namespace cad                      */
 }          /* End namespace dd4hep                   */
-#endif // DDCAD_INPUTWRITER_H
+
+#endif // DDCAD_OUTPUTWRITER_H
diff --git a/DDCore/include/DD4hep/DetType.h b/DDCore/include/DD4hep/DetType.h
index 8e130bffc..41fbb449c 100644
--- a/DDCore/include/DD4hep/DetType.h
+++ b/DDCore/include/DD4hep/DetType.h
@@ -14,6 +14,8 @@
 #ifndef DD4HEP_DETTYPE_H
 #define DD4HEP_DETTYPE_H
 
+#include <ostream>
+
 /// Namespace for the AIDA detector description toolkit
 namespace dd4hep {
 
diff --git a/DDCore/include/DD4hep/GrammarParsed.h b/DDCore/include/DD4hep/GrammarParsed.h
index 45509c693..8081c7ce5 100644
--- a/DDCore/include/DD4hep/GrammarParsed.h
+++ b/DDCore/include/DD4hep/GrammarParsed.h
@@ -18,8 +18,8 @@
 // sufficient for all practical purposes.
 //
 //==========================================================================
-#ifndef DD4HEP_DDCORE_GRAMMARPARSED_H
-#define DD4HEP_DDCORE_GRAMMARPARSED_H
+#ifndef DD4HEP_GRAMMARPARSED_H
+#define DD4HEP_GRAMMARPARSED_H
 
 #if defined(DD4HEP_DDCORE_GRAMMARUNPARSED_H)
 #pragma error "The header files GrammarParsed.h and GrammarUnparsed.h may not be included in the same compilation unit!"
@@ -341,4 +341,4 @@ namespace dd4hep {
 #define DD4HEP_DEFINE_PARSER_GRAMMAR_CONT_VL(xx,eval_func)  DD4HEP_DEFINE_PARSER_GRAMMAR_CONT_VL_SERIAL(__LINE__,xx,eval_func)
 #define DD4HEP_DEFINE_PARSER_GRAMMAR_DUMMY(xx,func)         DD4HEP_DEFINE_PARSER_GRAMMAR_DUMMY_SERIAL(__LINE__,xx,func)
 
-#endif // DD4HEP_DDCORE_GRAMMARPARSED_H
+#endif // DD4HEP_GRAMMARPARSED_H
diff --git a/DDCore/include/DD4hep/GrammarUnparsed.h b/DDCore/include/DD4hep/GrammarUnparsed.h
index 83d0961f3..be82f1551 100644
--- a/DDCore/include/DD4hep/GrammarUnparsed.h
+++ b/DDCore/include/DD4hep/GrammarUnparsed.h
@@ -18,8 +18,8 @@
 // sufficient for all practical purposes.
 //
 //==========================================================================
-#ifndef DD4HEP_DDCORE_GRAMMARUNPARSED_H
-#define DD4HEP_DDCORE_GRAMMARUNPARSED_H
+#ifndef DD4HEP_GRAMMARUNPARSED_H
+#define DD4HEP_GRAMMARUNPARSED_H
 
 #if defined(DD4HEP_DDCORE_GRAMMARPARSED_H)
 #pragma error "The header files GrammarParsed.h and GrammarUnparsed.h may not be included in the same compilation unit!"
@@ -37,4 +37,4 @@ namespace dd4hep {
     return s_gr;
   }
 }
-#endif // DD4HEP_DDCORE_GRAMMARUNPARSED_H
+#endif // DD4HEP_GRAMMARUNPARSED_H
diff --git a/DDCore/include/XML/UnicodeValues.h b/DDCore/include/XML/UnicodeValues.h
index 89d4ec706..3a2cbdedf 100644
--- a/DDCore/include/XML/UnicodeValues.h
+++ b/DDCore/include/XML/UnicodeValues.h
@@ -627,4 +627,4 @@ UNICODE (zmax);
 UNICODE (zplane);
 UNICODE (zstart);
 
-#endif
+#endif // XML_UNICODEVALUES_H
diff --git a/DDG4/include/DDG4/Geant4FastSimHandler.h b/DDG4/include/DDG4/Geant4FastSimHandler.h
index 1a8091e33..26b844d89 100644
--- a/DDG4/include/DDG4/Geant4FastSimHandler.h
+++ b/DDG4/include/DDG4/Geant4FastSimHandler.h
@@ -115,4 +115,4 @@ namespace dd4hep {
 
   }    // End namespace sim
 }      // End namespace dd4hep
-#endif // DDG4_GEANT4FASTSIMSPOTHANDLER_H
+#endif // DDG4_GEANT4FASTSIMHANDLER_H
diff --git a/DDG4/include/DDG4/Geant4FastSimShowerModel.h b/DDG4/include/DDG4/Geant4FastSimShowerModel.h
index e8677389e..cd8ed73ae 100644
--- a/DDG4/include/DDG4/Geant4FastSimShowerModel.h
+++ b/DDG4/include/DDG4/Geant4FastSimShowerModel.h
@@ -168,4 +168,4 @@ namespace dd4hep  {
     };
   }     /* End namespace sim   */
 }       /* End namespace dd4hep */
-#endif  /* DDG4_GEANT4FASTSIMSHOWERMODEL_H  */
+#endif // DDG4_GEANT4FASTSIMSHOWERMODEL_H
diff --git a/DDG4/include/DDG4/Geant4HitHandler.h b/DDG4/include/DDG4/Geant4HitHandler.h
index 8f8ffccf3..0f2770aae 100644
--- a/DDG4/include/DDG4/Geant4HitHandler.h
+++ b/DDG4/include/DDG4/Geant4HitHandler.h
@@ -132,4 +132,4 @@ namespace dd4hep {
   }    // End namespace sim
 }      // End namespace dd4hep
 
-#endif // DDG4_GEANT4GFLASHSPOTHANDLER_H
+#endif // DDG4_GEANT4HITHANDLER_H
diff --git a/DDParsers/include/Evaluator/detail/Evaluator.h b/DDParsers/include/Evaluator/detail/Evaluator.h
index ac706c88b..5d3f1a24d 100644
--- a/DDParsers/include/Evaluator/detail/Evaluator.h
+++ b/DDParsers/include/Evaluator/detail/Evaluator.h
@@ -11,8 +11,8 @@
 // -*- C++ -*-
 // ---------------------------------------------------------------------------
 
-#ifndef EVALUATOR_DETAIL_EVALUATOROBJECT_H
-#define EVALUATOR_DETAIL_EVALUATOROBJECT_H
+#ifndef EVALUATOR_DETAIL_EVALUATOR_H
+#define EVALUATOR_DETAIL_EVALUATOR_H
 
 #include <ostream>
 
@@ -322,4 +322,4 @@ namespace dd4hep  {
   }   // namespace tools
 }  // namespace dd4hep
 
-#endif // EVALUATOR_DETAIL_EVALUATOROBJECT_H
+#endif // EVALUATOR_DETAIL_EVALUATOR_H
-- 
GitLab