diff --git a/DDCAD/include/DDCAD/OutputWriter.h b/DDCAD/include/DDCAD/OutputWriter.h index 8640646c155d90b870e7a3d6be3e0f04a58d559c..9e47b47f1c6fffc2e0a088f04c0781738a44513a 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 8e130bffc369d5d76fd4b44169ddf61c87fc2158..41fbb449c22b16f1e85c7d5ac61406fe05550345 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 45509c693cbe2e061d6274d041101ea21a7701a0..8081c7ce52247cf3a533cd0134090f480cf067bd 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 83d0961f36a784cf1ce1673fc9f20c546f42f359..be82f155105dbc3b94962013d423a367f5ee766d 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 89d4ec706704eb648d2a89f1af67c6b056ef75a9..3a2cbdedf1340a13588a1f33688076c236a9238d 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 1a8091e331402126ff631db8129176683be6a44e..26b844d89c0a0e2e1262b79606fe60fdf669d4fd 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 e8677389efe2d7b78e6a7bb455fc53ad8a417331..cd8ed73ae098ac60d811f3bea1ecd4c168fb3d2f 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 8f8ffccf3f531b7f4857f2a4a71cb5657ce15b85..0f2770aae8e37c2df54d8e0e4e2cf6be784aaf4d 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 ac706c88b0eed9696b24da95e62da80fc77cc89e..5d3f1a24de1c33f95bdca08038f4cd54e2d41518 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