From 225ae7fa984f6e34c47ffadefa5ae2e344430920 Mon Sep 17 00:00:00 2001
From: Marco Clemencic <marco.clemencic@cern.ch>
Date: Wed, 13 Sep 2023 12:53:23 +0200
Subject: [PATCH] Update C++ formatting according to clang-format-16

---
 GaudiAlg/include/GaudiAlg/GaudiAlgorithm.h    |   2 +-
 GaudiAlg/include/GaudiAlg/GaudiCommon.h       |   4 +-
 GaudiAlg/include/GaudiAlg/GaudiHistoTool.h    |   4 +-
 GaudiAlg/include/GaudiAlg/GaudiTool.h         |   2 +-
 GaudiAlg/include/GaudiAlg/GaudiTupleTool.h    |   4 +-
 GaudiAlg/include/GaudiAlg/TupleObj.h          |   2 +-
 GaudiAlg/include/GaudiAlg/TuplePut.h          |   2 +-
 GaudiAlg/src/components/HistoTool.h           |   4 +-
 .../src/components/SequencerTimerTool.cpp     |   2 +-
 GaudiAlg/src/components/TimingAuditor.cpp     |   4 +-
 GaudiAlg/src/components/TupleTool.h           |   4 +-
 GaudiAud/src/AlgContextAuditor.h              |   4 +-
 GaudiAud/src/ProcStats.h                      |   2 +-
 GaudiCommonSvc/src/AlgContextSvc.h            |   4 +-
 GaudiCommonSvc/src/ChronoStatSvc.h            |   4 +-
 GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp    |   4 +-
 GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp    |  40 +++---
 GaudiExamples/src/Allocator/MyClass1A.h       |   2 +-
 .../FunctionalAlgorithms/MakeAndConsume.cpp   |   8 +-
 .../include/Gaudi/Functional/details.h        |   8 +-
 .../include/Gaudi/Functional/utilities.h      |   6 +-
 GaudiHive/src/AvalancheSchedulerSvc.cpp       |   2 +-
 .../src/PRGraph/PrecedenceRulesGraph.cpp      |   2 +-
 GaudiKernel/include/Gaudi/Accumulators.h      |  22 ++--
 .../include/Gaudi/Accumulators/Histogram.h    |   4 +-
 GaudiKernel/include/Gaudi/Arena/Monotonic.h   |   6 +-
 .../include/Gaudi/Histograming/Sink/Utils.h   |   8 +-
 GaudiKernel/include/Gaudi/Sequencer.h         |   2 +-
 .../include/GaudiKernel/AnyDataWrapper.h      |  12 +-
 GaudiKernel/include/GaudiKernel/Auditor.h     |   2 +-
 GaudiKernel/include/GaudiKernel/Chrono.h      |   2 +-
 .../include/GaudiKernel/ConversionSvc.h       |   4 +-
 GaudiKernel/include/GaudiKernel/Guards.h      |   8 +-
 GaudiKernel/include/GaudiKernel/IBinder.h     |   8 +-
 GaudiKernel/include/GaudiKernel/IInterface.h  |   4 +-
 GaudiKernel/include/GaudiKernel/KeyedObject.h |   8 +-
 GaudiKernel/include/GaudiKernel/LinkManager.h |   8 +-
 .../include/GaudiKernel/ObjectContainerBase.h |   4 +-
 GaudiKernel/include/GaudiKernel/ObjectList.h  |   2 +-
 .../include/GaudiKernel/ObjectVector.h        |   4 +-
 .../include/GaudiKernel/PropertyHolder.h      |   2 +-
 GaudiKernel/include/GaudiKernel/PropertyMgr.h |   4 +-
 .../GaudiKernel/SharedObjectsContainer.h      |   2 +-
 GaudiKernel/include/GaudiKernel/SmartIF.h     |   2 +-
 .../include/GaudiKernel/StreamBuffer.h        |   4 +-
 GaudiKernel/include/GaudiKernel/TaggedBool.h  |   2 +-
 GaudiKernel/src/Lib/ConversionSvc.cpp         |   5 +-
 GaudiKernel/src/Lib/DataObjectHandleBase.cpp  |  10 +-
 GaudiKernel/src/Lib/DataSvc.cpp               |   2 +-
 GaudiKernel/src/Lib/Message.cpp               | 124 +++++++++---------
 GaudiKernel/src/Lib/ModuleInfo.cpp            |   6 +-
 GaudiKernel/src/Lib/ProcessDescriptor.cpp     |   4 +-
 GaudiKernel/src/Lib/RegistryEntry.cpp         |   2 +-
 GaudiKernel/src/Lib/Time.cpp                  |   2 +-
 GaudiKernel/src/Lib/TsDataSvc.cpp             |   2 +-
 GaudiKernel/tests/src/test_GaudiTime.cpp      |   4 +-
 GaudiKernel/tests/src/test_GaudiTiming.cpp    |   4 +-
 GaudiKernel/tests/src/test_SerializeSTL.cpp   |   4 +-
 GaudiPartProp/src/ParticlePropertySvc.cpp     |   2 +-
 .../src/component/PerfMonAuditor.cpp          |   8 +-
 .../src/component/valgrind/local_valgrind.h   |   2 +-
 GaudiSvc/src/DetectorDataSvc/DetDataSvc.h     |   2 +-
 GaudiSvc/src/THistSvc/THistSvc.h              |   2 +-
 GaudiUtils/src/component/XMLFileCatalog.cpp   |   6 +-
 RootCnv/include/RootCnv/RootCnvSvc.h          |   2 +-
 RootCnv/src/RootUtils.h                       |   2 +-
 66 files changed, 216 insertions(+), 223 deletions(-)

diff --git a/GaudiAlg/include/GaudiAlg/GaudiAlgorithm.h b/GaudiAlg/include/GaudiAlg/GaudiAlgorithm.h
index 107a551d32..8123a3c389 100644
--- a/GaudiAlg/include/GaudiAlg/GaudiAlgorithm.h
+++ b/GaudiAlg/include/GaudiAlg/GaudiAlgorithm.h
@@ -645,7 +645,7 @@ public:
   // no default/copy constructor, no assignment -- except that ROOT really
   // wants a default constructor declared. So we define it, and don't implement
   // it...
-  GaudiAlgorithm( const GaudiAlgorithm& ) = delete;
+  GaudiAlgorithm( const GaudiAlgorithm& )            = delete;
   GaudiAlgorithm& operator=( const GaudiAlgorithm& ) = delete;
   // ==========================================================================
 public:
diff --git a/GaudiAlg/include/GaudiAlg/GaudiCommon.h b/GaudiAlg/include/GaudiAlg/GaudiCommon.h
index 18ca3853da..beea24d335 100644
--- a/GaudiAlg/include/GaudiAlg/GaudiCommon.h
+++ b/GaudiAlg/include/GaudiAlg/GaudiCommon.h
@@ -630,8 +630,8 @@ public:
    */
   StatusCode finalize() override;
 
-  GaudiCommon()                     = delete;
-  GaudiCommon( const GaudiCommon& ) = delete;
+  GaudiCommon()                                = delete;
+  GaudiCommon( const GaudiCommon& )            = delete;
   GaudiCommon& operator=( const GaudiCommon& ) = delete;
 
 protected:
diff --git a/GaudiAlg/include/GaudiAlg/GaudiHistoTool.h b/GaudiAlg/include/GaudiAlg/GaudiHistoTool.h
index 8f902e55cf..3483d01580 100644
--- a/GaudiAlg/include/GaudiAlg/GaudiHistoTool.h
+++ b/GaudiAlg/include/GaudiAlg/GaudiHistoTool.h
@@ -53,8 +53,8 @@ struct GAUDI_API GaudiHistoTool : GaudiHistos<GaudiTool> {
   using GaudiHistos<GaudiTool>::finalize;
 
   // delete default/copy constructor and assignment
-  GaudiHistoTool()                        = delete;
-  GaudiHistoTool( const GaudiHistoTool& ) = delete;
+  GaudiHistoTool()                                   = delete;
+  GaudiHistoTool( const GaudiHistoTool& )            = delete;
   GaudiHistoTool& operator=( const GaudiHistoTool& ) = delete;
 };
 
diff --git a/GaudiAlg/include/GaudiAlg/GaudiTool.h b/GaudiAlg/include/GaudiAlg/GaudiTool.h
index 41b21c5d04..44b393c805 100644
--- a/GaudiAlg/include/GaudiAlg/GaudiTool.h
+++ b/GaudiAlg/include/GaudiAlg/GaudiTool.h
@@ -739,7 +739,7 @@ public:
 private:
   // ==========================================================================
   /// no copy constructor, no assignment
-  GaudiTool( const GaudiTool& ) = delete;
+  GaudiTool( const GaudiTool& )            = delete;
   GaudiTool& operator=( const GaudiTool& ) = delete;
   // ==========================================================================
 private:
diff --git a/GaudiAlg/include/GaudiAlg/GaudiTupleTool.h b/GaudiAlg/include/GaudiAlg/GaudiTupleTool.h
index dd73adee1e..193303ba63 100644
--- a/GaudiAlg/include/GaudiAlg/GaudiTupleTool.h
+++ b/GaudiAlg/include/GaudiAlg/GaudiTupleTool.h
@@ -52,8 +52,8 @@ struct GAUDI_API GaudiTupleTool : GaudiTuples<GaudiHistoTool> {
 
   using GaudiTuples<GaudiHistoTool>::GaudiTuples;
 
-  GaudiTupleTool()                        = delete;
-  GaudiTupleTool( const GaudiTupleTool& ) = delete;
+  GaudiTupleTool()                                   = delete;
+  GaudiTupleTool( const GaudiTupleTool& )            = delete;
   GaudiTupleTool& operator=( const GaudiTupleTool& ) = delete;
 };
 
diff --git a/GaudiAlg/include/GaudiAlg/TupleObj.h b/GaudiAlg/include/GaudiAlg/TupleObj.h
index 6968cafe19..a3a084e63a 100644
--- a/GaudiAlg/include/GaudiAlg/TupleObj.h
+++ b/GaudiAlg/include/GaudiAlg/TupleObj.h
@@ -1934,7 +1934,7 @@ namespace Tuples {
     FMatrix* fMatrix( std::string_view name, const MIndex& rows, const MIndex& cols );
     // =======================================================================
     /// delete the copy constructor and assignment
-    TupleObj( const TupleObj& ) = delete;
+    TupleObj( const TupleObj& )            = delete;
     TupleObj& operator=( const TupleObj& ) = delete;
     // =======================================================================
   private:
diff --git a/GaudiAlg/include/GaudiAlg/TuplePut.h b/GaudiAlg/include/GaudiAlg/TuplePut.h
index d9f912e225..9e56ceacba 100644
--- a/GaudiAlg/include/GaudiAlg/TuplePut.h
+++ b/GaudiAlg/include/GaudiAlg/TuplePut.h
@@ -95,7 +95,7 @@ namespace Tuples {
     }
 
     // delete copy constructor and assignment
-    ItemStore( const ItemStore& ) = delete;
+    ItemStore( const ItemStore& )            = delete;
     ItemStore& operator=( const ItemStore& ) = delete;
 
   private:
diff --git a/GaudiAlg/src/components/HistoTool.h b/GaudiAlg/src/components/HistoTool.h
index f9343b54d6..ceedd7fe83 100644
--- a/GaudiAlg/src/components/HistoTool.h
+++ b/GaudiAlg/src/components/HistoTool.h
@@ -191,8 +191,8 @@ public:
   // check the existence AND validity of the histogram with given title
   bool histoExists( const HistoID& ID ) const override { return GaudiHistoTool::histoExists( ID ); }
 
-  HistoTool()                   = delete;
-  HistoTool( const HistoTool& ) = delete;
+  HistoTool()                              = delete;
+  HistoTool( const HistoTool& )            = delete;
   HistoTool& operator=( const HistoTool& ) = delete;
 };
 
diff --git a/GaudiAlg/src/components/SequencerTimerTool.cpp b/GaudiAlg/src/components/SequencerTimerTool.cpp
index b25425c254..a2ac6eae74 100644
--- a/GaudiAlg/src/components/SequencerTimerTool.cpp
+++ b/GaudiAlg/src/components/SequencerTimerTool.cpp
@@ -99,7 +99,7 @@ int SequencerTimerTool::indexByName( const std::string& name ) {
     beg = timer.name().find_first_not_of( " \t" );
     end = timer.name().find_last_not_of( " \t" );
     return timer.name().compare( beg, end - beg + 1, temp ) == 0;
-     } );
+  } );
   return i != std::end( m_timerList ) ? std::distance( std::begin( m_timerList ), i ) : -1;
 }
 
diff --git a/GaudiAlg/src/components/TimingAuditor.cpp b/GaudiAlg/src/components/TimingAuditor.cpp
index ee9b7d9649..b4c7225688 100644
--- a/GaudiAlg/src/components/TimingAuditor.cpp
+++ b/GaudiAlg/src/components/TimingAuditor.cpp
@@ -63,8 +63,8 @@ public:
   using extends::extends;
 
   // delete default/copy constructor and assignment
-  TimingAuditor()                       = delete;
-  TimingAuditor( const TimingAuditor& ) = delete;
+  TimingAuditor()                                  = delete;
+  TimingAuditor( const TimingAuditor& )            = delete;
   TimingAuditor& operator=( const TimingAuditor& ) = delete;
 
 private:
diff --git a/GaudiAlg/src/components/TupleTool.h b/GaudiAlg/src/components/TupleTool.h
index 7cf962cba0..38f77dabbb 100644
--- a/GaudiAlg/src/components/TupleTool.h
+++ b/GaudiAlg/src/components/TupleTool.h
@@ -79,8 +79,8 @@ public:
     return GaudiTupleTool::evtCol( ID, title, clid );
   }
 
-  TupleTool()                   = delete;
-  TupleTool( const TupleTool& ) = delete;
+  TupleTool()                              = delete;
+  TupleTool( const TupleTool& )            = delete;
   TupleTool& operator=( const TupleTool& ) = delete;
 };
 #endif // GAUDIALG_TUPLETOOL_H
diff --git a/GaudiAud/src/AlgContextAuditor.h b/GaudiAud/src/AlgContextAuditor.h
index 9a0ca4b198..1a087b7065 100644
--- a/GaudiAud/src/AlgContextAuditor.h
+++ b/GaudiAud/src/AlgContextAuditor.h
@@ -50,8 +50,8 @@ public:
 
 private:
   /// delete the default/copy constructor and assignment
-  AlgContextAuditor()                           = delete;
-  AlgContextAuditor( const AlgContextAuditor& ) = delete;
+  AlgContextAuditor()                                      = delete;
+  AlgContextAuditor( const AlgContextAuditor& )            = delete;
   AlgContextAuditor& operator=( const AlgContextAuditor& ) = delete;
 
 private:
diff --git a/GaudiAud/src/ProcStats.h b/GaudiAud/src/ProcStats.h
index 08dcbddf5e..99f885293b 100644
--- a/GaudiAud/src/ProcStats.h
+++ b/GaudiAud/src/ProcStats.h
@@ -70,7 +70,7 @@ private:
     int m_fd{ -1 };
 
   private:
-    unique_fd( const unique_fd& ) = delete;
+    unique_fd( const unique_fd& )            = delete;
     unique_fd& operator=( const unique_fd& ) = delete;
 
   public:
diff --git a/GaudiCommonSvc/src/AlgContextSvc.h b/GaudiCommonSvc/src/AlgContextSvc.h
index e214120619..862c6b5d61 100644
--- a/GaudiCommonSvc/src/AlgContextSvc.h
+++ b/GaudiCommonSvc/src/AlgContextSvc.h
@@ -67,8 +67,8 @@ public:
 
 private:
   // default/copy constructor & asignment are deleted
-  AlgContextSvc()                       = delete;
-  AlgContextSvc( const AlgContextSvc& ) = delete;
+  AlgContextSvc()                                  = delete;
+  AlgContextSvc( const AlgContextSvc& )            = delete;
   AlgContextSvc& operator=( const AlgContextSvc& ) = delete;
 
 private:
diff --git a/GaudiCommonSvc/src/ChronoStatSvc.h b/GaudiCommonSvc/src/ChronoStatSvc.h
index 9485ffdc29..a9424dde63 100644
--- a/GaudiCommonSvc/src/ChronoStatSvc.h
+++ b/GaudiCommonSvc/src/ChronoStatSvc.h
@@ -132,8 +132,8 @@ protected:
 private:
   // ============================================================================
   // default/copy constructor and assignment are disabled
-  ChronoStatSvc()                       = delete;
-  ChronoStatSvc( const ChronoStatSvc& ) = delete;
+  ChronoStatSvc()                                  = delete;
+  ChronoStatSvc( const ChronoStatSvc& )            = delete;
   ChronoStatSvc& operator=( const ChronoStatSvc& ) = delete;
   // ============================================================================
   /// dump the statistics into an ASCII file for offline processing
diff --git a/GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp b/GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp
index 81463b9ffb..18f29cfb78 100644
--- a/GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp
+++ b/GaudiCommonSvc/src/DataSvc/EvtStoreSvc.cpp
@@ -61,10 +61,10 @@ namespace {
       if ( m_data ) m_data->setRegistry( this );
       if ( m_addr ) m_addr->setRegistry( this );
     }
-    Entry( const Entry& ) = delete;
+    Entry( const Entry& )                = delete;
     Entry& operator=( const Entry& rhs ) = delete;
     Entry( Entry&& rhs )                 = delete;
-    Entry& operator=( Entry&& rhs ) = delete;
+    Entry& operator=( Entry&& rhs )      = delete;
 
     // required by IRegistry...
     unsigned long    addRef() override { return -1; }
diff --git a/GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp b/GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp
index 5c33da65e9..889f91d0d4 100644
--- a/GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp
+++ b/GaudiCoreSvc/src/MessageSvc/MessageSvc.cpp
@@ -100,7 +100,7 @@ MessageSvc::MessageSvc( const std::string& name, ISvcLocator* svcloc ) : base_cl
   std::fill( std::begin( m_msgCount ), std::end( m_msgCount ), 0 );
 }
 
-//#############################################################################
+// #############################################################################
 
 /// Initialize Service
 StatusCode MessageSvc::initialize() {
@@ -117,7 +117,7 @@ StatusCode MessageSvc::initialize() {
   return StatusCode::SUCCESS;
 }
 
-//#############################################################################
+// #############################################################################
 
 /// Reinitialize Service
 StatusCode MessageSvc::reinitialize() {
@@ -128,7 +128,7 @@ StatusCode MessageSvc::reinitialize() {
   return sc;
 }
 
-//#############################################################################
+// #############################################################################
 
 void MessageSvc::setupColors( Gaudi::Details::PropertyBase& prop ) {
   const auto& pname = prop.name();
@@ -163,7 +163,7 @@ void MessageSvc::setupColors( Gaudi::Details::PropertyBase& prop ) {
     code = "";
   }
 }
-//#############################################################################
+// #############################################################################
 
 void MessageSvc::setupLimits( Gaudi::Details::PropertyBase& prop ) {
   // Just report problems in the settings of the limits and unknown limit parameters
@@ -183,7 +183,7 @@ void MessageSvc::setupLimits( Gaudi::Details::PropertyBase& prop ) {
     return;
   }
 }
-//#############################################################################
+// #############################################################################
 
 void MessageSvc::setupThreshold( Gaudi::Details::PropertyBase& prop ) {
 
@@ -212,7 +212,7 @@ void MessageSvc::setupThreshold( Gaudi::Details::PropertyBase& prop ) {
   }
 }
 
-//#############################################################################
+// #############################################################################
 
 #ifdef NDEBUG
 void MessageSvc::setupInactCount( Gaudi::Details::PropertyBase& ) {}
@@ -225,7 +225,7 @@ void MessageSvc::setupInactCount( Gaudi::Details::PropertyBase& prop ) {
 }
 #endif
 
-//#############################################################################
+// #############################################################################
 /// Finalize Service
 StatusCode MessageSvc::finalize() {
 
@@ -335,7 +335,7 @@ StatusCode MessageSvc::finalize() {
   return StatusCode::SUCCESS;
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: reportMessage
 // Purpose: dispatches a message to the relevant streams.
@@ -393,7 +393,7 @@ void MessageSvc::i_reportMessage( const Message& msg, int outputLevel ) {
   if ( cmsg != &msg ) { delete cmsg; }
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: reportMessage
 // Purpose: dispatches a message to the relevant streams.
@@ -401,7 +401,7 @@ void MessageSvc::i_reportMessage( const Message& msg, int outputLevel ) {
 //
 void MessageSvc::reportMessage( const Message& msg ) { reportMessage( msg, outputLevel( msg.getSource() ) ); }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: reportMessage
 // Purpose: dispatches a message to the relevant streams.
@@ -411,7 +411,7 @@ void MessageSvc::reportMessage( std::string source, int type, std::string messag
   reportMessage( Message{ std::move( source ), type, std::move( message ) } );
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: sendMessage
 // Purpose: finds a message for a given status code and dispatches it.
@@ -439,7 +439,7 @@ void MessageSvc::i_reportMessage( const StatusCode& code, std::string_view sourc
   }
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: insertStream
 // Purpose: inserts a stream for a message type.
@@ -450,7 +450,7 @@ void MessageSvc::insertStream( int key, std::string name, std::ostream* stream )
   m_streamMap.emplace( key, NamedStream( std::move( name ), stream ) );
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: eraseStream
 // Purpose: erases all the streams for all the message types.
@@ -459,7 +459,7 @@ void MessageSvc::insertStream( int key, std::string name, std::ostream* stream )
 
 void MessageSvc::eraseStream() { m_streamMap.clear(); }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: eraseStream
 // Purpose: erases all the streams for a message type.
@@ -468,7 +468,7 @@ void MessageSvc::eraseStream() { m_streamMap.clear(); }
 
 void MessageSvc::eraseStream( int message_type ) { m_streamMap.erase( message_type ); }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: eraseStream
 // Purpose: erases one stream for a message type.
@@ -482,7 +482,7 @@ void MessageSvc::eraseStream( int key, std::ostream* stream ) {
   }
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: eraseStream
 // Purpose: erases one stream for all message types.
@@ -495,7 +495,7 @@ void MessageSvc::eraseStream( std::ostream* stream ) {
   }
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: insertMessage
 // Purpose: inserts a message for a status code.
@@ -507,7 +507,7 @@ void MessageSvc::insertMessage( const StatusCode& key, Message msg ) {
   m_messageMap.emplace( key, std::move( msg ) );
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: eraseMessage
 // Purpose: erases all the messages for all the status codes.
@@ -519,7 +519,7 @@ void MessageSvc::eraseMessage() {
   m_messageMap.clear();
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: eraseMessage
 // Purpose: erases all the messages for a status code.
@@ -531,7 +531,7 @@ void MessageSvc::eraseMessage( const StatusCode& key ) {
   m_messageMap.erase( key );
 }
 
-//#############################################################################
+// #############################################################################
 // ---------------------------------------------------------------------------
 // Routine: eraseMessage
 // Purpose: erases one message for a status code.
diff --git a/GaudiExamples/src/Allocator/MyClass1A.h b/GaudiExamples/src/Allocator/MyClass1A.h
index ec98e8f162..a952cb0f2a 100644
--- a/GaudiExamples/src/Allocator/MyClass1A.h
+++ b/GaudiExamples/src/Allocator/MyClass1A.h
@@ -33,7 +33,7 @@ public:
 
 public:
   void* operator new( size_t );
-  void  operator delete( void* hit );
+  void operator delete( void* hit );
 
 private:
   // Empty class:                  // gain is ~3.5
diff --git a/GaudiExamples/src/FunctionalAlgorithms/MakeAndConsume.cpp b/GaudiExamples/src/FunctionalAlgorithms/MakeAndConsume.cpp
index e80aabb6d6..0132a9a9e0 100644
--- a/GaudiExamples/src/FunctionalAlgorithms/MakeAndConsume.cpp
+++ b/GaudiExamples/src/FunctionalAlgorithms/MakeAndConsume.cpp
@@ -527,9 +527,9 @@ namespace Gaudi::Examples {
     int i;
 
     Foo( int i ) : i{ i } {}
-    Foo( Foo&& ) = delete;
-    Foo& operator=( Foo&& ) = delete;
-    Foo( const Foo& )       = delete;
+    Foo( Foo&& )                 = delete;
+    Foo& operator=( Foo&& )      = delete;
+    Foo( const Foo& )            = delete;
     Foo& operator=( const Foo& ) = delete;
     ~Foo(){};
   };
@@ -595,7 +595,7 @@ namespace Gaudi::Examples {
     Gaudi::Algorithm const* parent              = nullptr;
     void ( *action )( Gaudi::Algorithm const* ) = nullptr;
     Eventually( Gaudi::Algorithm const* p, void ( *a )( Gaudi::Algorithm const* ) ) : parent{ p }, action{ a } {}
-    Eventually( Eventually const& ) = delete;
+    Eventually( Eventually const& )            = delete;
     Eventually& operator=( Eventually const& ) = delete;
     Eventually( Eventually&& other )
         : parent{ std::exchange( other.parent, nullptr ) }, action{ std::exchange( other.action, nullptr ) } {}
diff --git a/GaudiFunctional/include/Gaudi/Functional/details.h b/GaudiFunctional/include/Gaudi/Functional/details.h
index e6c8ed7991..e8979c6cc5 100644
--- a/GaudiFunctional/include/Gaudi/Functional/details.h
+++ b/GaudiFunctional/include/Gaudi/Functional/details.h
@@ -331,7 +331,7 @@ namespace Gaudi::Functional::details {
         --m_i;
         return *this;
       }
-      bool     is_null() const { return !*m_i; }
+      bool is_null() const { return !*m_i; }
       explicit operator bool() const { return !is_null(); }
     };
     vector_of_const_() = default;
@@ -510,9 +510,9 @@ namespace Gaudi::Functional::details {
   void updateHandleLocations( DataHandleMixin<Out, In, Tr>& parent, const std::string& prop,
                               const std::vector<std::string>& newLocs ) {
     std::ostringstream ss;
-    GaudiUtils::details::ostream_joiner(
-        ss << '[', newLocs, ", ", []( std::ostream & os, const auto& i ) -> auto& { return os << "'" << i << "'"; } )
-        << ']';
+    GaudiUtils::details::ostream_joiner( ss << '[', newLocs, ", ", []( std::ostream& os, const auto& i ) -> auto& {
+      return os << "'" << i << "'";
+    } ) << ']';
     auto sc = parent.setProperty( prop, ss.str() );
     if ( sc.isFailure() ) throw GaudiException( "Could not set Property", prop + " -> " + ss.str(), sc );
   }
diff --git a/GaudiFunctional/include/Gaudi/Functional/utilities.h b/GaudiFunctional/include/Gaudi/Functional/utilities.h
index de42e2f446..dd1c992ddd 100644
--- a/GaudiFunctional/include/Gaudi/Functional/utilities.h
+++ b/GaudiFunctional/include/Gaudi/Functional/utilities.h
@@ -38,9 +38,9 @@ namespace Gaudi::Functional {
       "please use `updateHandleLocations` instead of `Gaudi::Functional::updateHandleLocations`" )]] inline void
   updateHandleLocations( IProperty& parent, const std::string& prop, const std::vector<std::string>& newLocs ) {
     std::ostringstream ss;
-    GaudiUtils::details::ostream_joiner(
-        ss << '[', newLocs, ", ", []( std::ostream & os, const auto& i ) -> auto& { return os << "'" << i << "'"; } )
-        << ']';
+    GaudiUtils::details::ostream_joiner( ss << '[', newLocs, ", ", []( std::ostream& os, const auto& i ) -> auto& {
+      return os << "'" << i << "'";
+    } ) << ']';
     auto sc = parent.setProperty( prop, ss.str() );
     if ( sc.isFailure() ) throw GaudiException( "Could not set Property", prop + " -> " + ss.str(), sc );
   }
diff --git a/GaudiHive/src/AvalancheSchedulerSvc.cpp b/GaudiHive/src/AvalancheSchedulerSvc.cpp
index 5d7aab7bc2..3adad83b77 100644
--- a/GaudiHive/src/AvalancheSchedulerSvc.cpp
+++ b/GaudiHive/src/AvalancheSchedulerSvc.cpp
@@ -213,7 +213,7 @@ StatusCode AvalancheSchedulerSvc::initialize() {
           auto tokens = boost::tokenizer<boost::char_separator<char>>{ id.key(), boost::char_separator<char>{ ":" } };
           auto itok   = std::find_if( tokens.begin(), tokens.end(), [&]( const std::string& t ) {
             return globalOutp.find( DataObjID{ t } ) != globalOutp.end();
-            } );
+          } );
           if ( itok != tokens.end() ) {
             ostdd << "found matching output for " << *itok << " -- updating scheduler info\n";
             id.updateKey( *itok );
diff --git a/GaudiHive/src/PRGraph/PrecedenceRulesGraph.cpp b/GaudiHive/src/PRGraph/PrecedenceRulesGraph.cpp
index 1aca7e9ac0..0220da2a9c 100644
--- a/GaudiHive/src/PRGraph/PrecedenceRulesGraph.cpp
+++ b/GaudiHive/src/PRGraph/PrecedenceRulesGraph.cpp
@@ -534,7 +534,7 @@ namespace concurrency {
     auto vp = vertices( m_PRGraph );
     auto i  = std::find_if( vp.first, vp.second, [&]( const PRVertexDesc& v ) {
       return std::visit( precedence::VertexName(), m_PRGraph[v] ) == name;
-     } );
+    } );
     return i != vp.second ? *i : PRVertexDesc{};
   }
 
diff --git a/GaudiKernel/include/Gaudi/Accumulators.h b/GaudiKernel/include/Gaudi/Accumulators.h
index a08f4b8ac0..43befc4262 100644
--- a/GaudiKernel/include/Gaudi/Accumulators.h
+++ b/GaudiKernel/include/Gaudi/Accumulators.h
@@ -816,7 +816,7 @@ namespace Gaudi::Accumulators {
   public:
     Buffer() = delete;
     Buffer( prime_type& p ) : base_type( construct_empty, p ), m_prime( p ) {}
-    Buffer( const Buffer& ) = delete;
+    Buffer( const Buffer& )         = delete;
     void operator=( const Buffer& ) = delete;
     Buffer( Buffer&& other ) : base_type( other ), m_prime( other.m_prime ) { other.reset(); }
     void push() { m_prime.mergeAndReset( static_cast<base_type&>( *this ) ); }
@@ -876,7 +876,7 @@ namespace Gaudi::Accumulators {
     template <typename OWNER>
     BufferableCounter( OWNER* o, std::string const& name ) : BufferableCounter( o, name, *this ) {}
     Buffer<Accumulator, Atomicity, Args...> buffer() { return { *this }; }
-    BufferableCounter( BufferableCounter const& ) = delete;
+    BufferableCounter( BufferableCounter const& )            = delete;
     BufferableCounter& operator=( BufferableCounter const& ) = delete;
     ~BufferableCounter() {
       if ( m_monitoringHub ) { m_monitoringHub->removeEntity( *this ); }
@@ -1103,12 +1103,12 @@ namespace Gaudi::Accumulators {
     friend void   mergeAndReset( BinomialCounter& c, BinomialCounter& o ) { c.mergeAndReset( o ); }
     friend void   to_json( nlohmann::json& j, BinomialCounter const& c ) {
       j = { { "type", c.typeString },
-            { "empty", c.nEntries() == 0 },
-            { "nEntries", c.nTrueEntries() + c.nFalseEntries() },
-            { "nTrueEntries", c.nTrueEntries() },
-            { "nFalseEntries", c.nFalseEntries() },
-            { "efficiency", c.efficiency() },
-            { "efficiencyErr", c.efficiencyErr() } };
+              { "empty", c.nEntries() == 0 },
+              { "nEntries", c.nTrueEntries() + c.nFalseEntries() },
+              { "nTrueEntries", c.nTrueEntries() },
+              { "nFalseEntries", c.nFalseEntries() },
+              { "efficiency", c.efficiency() },
+              { "efficiencyErr", c.efficiencyErr() } };
     }
     static BinomialCounter fromJSON( const nlohmann::json& j ) {
       return BinomialAccumulator<Atomicity, Arithmetic>::extractJSONData( j, { "nTrueEntries", "nFalseEntries" } );
@@ -1149,7 +1149,7 @@ namespace Gaudi::Accumulators {
       if ( by ) log();
       return *this;
     }
-    MsgCounter( MsgCounter const& ) = delete;
+    MsgCounter( MsgCounter const& )            = delete;
     MsgCounter& operator=( MsgCounter const& ) = delete;
     ~MsgCounter() {
       if ( m_monitoringHub ) m_monitoringHub->removeEntity( *this );
@@ -1166,8 +1166,8 @@ namespace Gaudi::Accumulators {
     friend void   mergeAndReset( MsgCounter& c, MsgCounter& o ) { c.mergeAndReset( o ); }
     friend void   to_json( nlohmann::json& j, MsgCounter const& c ) {
       j = { { "type", c.typeString },  { "empty", c.value() == 0 },
-            { "nEntries", c.value() }, { "level", level },
-            { "max", c.max },          { "msg", c.msg } };
+              { "nEntries", c.value() }, { "level", level },
+              { "max", c.max },          { "msg", c.msg } };
     }
     static MsgCounter fromJSON( const nlohmann::json& j ) {
       return { j.at( "msg" ).get<std::string>(), j.at( "max" ).get<unsigned long>(),
diff --git a/GaudiKernel/include/Gaudi/Accumulators/Histogram.h b/GaudiKernel/include/Gaudi/Accumulators/Histogram.h
index 1489fd1489..d77e067f11 100644
--- a/GaudiKernel/include/Gaudi/Accumulators/Histogram.h
+++ b/GaudiKernel/include/Gaudi/Accumulators/Histogram.h
@@ -243,8 +243,8 @@ namespace Gaudi::Accumulators {
     HistoInputType( Arithmetic a ) : value( a ) {}
     unsigned int computeIndex( const std::array<Axis<Arithmetic>, 1>& axis ) const { return axis[0].index( value ); }
     Arithmetic&  operator[]( int ) { return value; }
-                 operator Arithmetic() const { return value; }
-    auto         forInternalCounter() { return 1ul; }
+    operator Arithmetic() const { return value; }
+    auto forInternalCounter() { return 1ul; }
     template <typename AxisType>
     static unsigned int computeTotNBins( std::array<AxisType, 1> axis ) {
       return axis[0].nBins + 2;
diff --git a/GaudiKernel/include/Gaudi/Arena/Monotonic.h b/GaudiKernel/include/Gaudi/Arena/Monotonic.h
index d6507409de..f8e1db9c98 100644
--- a/GaudiKernel/include/Gaudi/Arena/Monotonic.h
+++ b/GaudiKernel/include/Gaudi/Arena/Monotonic.h
@@ -80,9 +80,9 @@ namespace Gaudi::Arena {
 
     // Allocators will hold pointers to instances of this class, deleting these
     // methods makes it harder to accidentally invalidate those pointers...
-    Monotonic( Monotonic&& )      = delete;
-    Monotonic( Monotonic const& ) = delete;
-    Monotonic& operator=( Monotonic&& ) = delete;
+    Monotonic( Monotonic&& )                 = delete;
+    Monotonic( Monotonic const& )            = delete;
+    Monotonic& operator=( Monotonic&& )      = delete;
     Monotonic& operator=( Monotonic const& ) = delete;
 
     /** Return an aligned point to n bytes of memory.
diff --git a/GaudiKernel/include/Gaudi/Histograming/Sink/Utils.h b/GaudiKernel/include/Gaudi/Histograming/Sink/Utils.h
index c090d156a5..d3fbc69023 100644
--- a/GaudiKernel/include/Gaudi/Histograming/Sink/Utils.h
+++ b/GaudiKernel/include/Gaudi/Histograming/Sink/Utils.h
@@ -210,9 +210,9 @@ namespace Gaudi::Histograming::Sink {
         // in turn leads to a self-inconsistent TProfile object. The "fix" is to disable sum of squares explicitly.
         this->Sumw2( false );
       }
-      ProfileWrapper( ProfileWrapper const& ) = delete;
-      ProfileWrapper& operator=( ProfileWrapper const& ) = delete;
-      ProfileWrapper( ProfileWrapper const&& )           = delete;
+      ProfileWrapper( ProfileWrapper const& )             = delete;
+      ProfileWrapper& operator=( ProfileWrapper const& )  = delete;
+      ProfileWrapper( ProfileWrapper const&& )            = delete;
       ProfileWrapper& operator=( ProfileWrapper const&& ) = delete;
       void            setBinNEntries( Int_t i, Int_t n ) { this->fBinEntries.fArray[i] = n; }
       void            setBinW2( Int_t i, Double_t v ) { this->fSumw2.fArray[i] = v; }
@@ -240,7 +240,7 @@ namespace Gaudi::Histograming::Sink {
                                         current = nextDir;
                                       }
                                       return current;
-                                             } );
+                                    } );
       if ( !currentDir )
         throw GaudiException( "Could not create directory " + dir, "Histogram::Sink::Root", StatusCode::FAILURE );
       // switch to the directory
diff --git a/GaudiKernel/include/Gaudi/Sequencer.h b/GaudiKernel/include/Gaudi/Sequencer.h
index 1237c527f4..f234289c01 100644
--- a/GaudiKernel/include/Gaudi/Sequencer.h
+++ b/GaudiKernel/include/Gaudi/Sequencer.h
@@ -162,7 +162,7 @@ namespace Gaudi {
     StatusCode remove( const std::string& algname, std::vector<Gaudi::Algorithm*>& theAlgs );
 
     // NO COPY / ASSIGNMENT  ALLOWED
-    Sequencer( const Sequencer& a ) = delete;
+    Sequencer( const Sequencer& a )              = delete;
     Sequencer& operator=( const Sequencer& rhs ) = delete;
 
   public:
diff --git a/GaudiKernel/include/GaudiKernel/AnyDataWrapper.h b/GaudiKernel/include/GaudiKernel/AnyDataWrapper.h
index 5e1adc341b..f66de321c5 100644
--- a/GaudiKernel/include/GaudiKernel/AnyDataWrapper.h
+++ b/GaudiKernel/include/GaudiKernel/AnyDataWrapper.h
@@ -37,9 +37,9 @@ protected:
 
 public:
   AnyDataWrapper( T&& data ) : m_data{ std::move( data ) } {};
-  AnyDataWrapper( AnyDataWrapper&& )      = delete;
-  AnyDataWrapper( AnyDataWrapper const& ) = delete;
-  AnyDataWrapper& operator=( AnyDataWrapper&& ) = delete;
+  AnyDataWrapper( AnyDataWrapper&& )                 = delete;
+  AnyDataWrapper( AnyDataWrapper const& )            = delete;
+  AnyDataWrapper& operator=( AnyDataWrapper&& )      = delete;
   AnyDataWrapper& operator=( AnyDataWrapper const& ) = delete;
 
   const T& getData() const { return m_data; }
@@ -59,8 +59,8 @@ public:
   AnyDataWithViewWrapper( OwnedType&& data ) : AnyDataWrapper<ViewType>{ {} }, m_owned{ std::move( data ) } {
     AnyDataWrapper<ViewType>::m_data = ViewType{ std::as_const( m_owned ) };
   }
-  AnyDataWithViewWrapper( AnyDataWithViewWrapper&& )      = delete;
-  AnyDataWithViewWrapper( AnyDataWithViewWrapper const& ) = delete;
-  AnyDataWithViewWrapper& operator=( AnyDataWithViewWrapper&& ) = delete;
+  AnyDataWithViewWrapper( AnyDataWithViewWrapper&& )                 = delete;
+  AnyDataWithViewWrapper( AnyDataWithViewWrapper const& )            = delete;
+  AnyDataWithViewWrapper& operator=( AnyDataWithViewWrapper&& )      = delete;
   AnyDataWithViewWrapper& operator=( AnyDataWithViewWrapper const& ) = delete;
 };
diff --git a/GaudiKernel/include/GaudiKernel/Auditor.h b/GaudiKernel/include/GaudiKernel/Auditor.h
index 1af231e22d..5124300962 100644
--- a/GaudiKernel/include/GaudiKernel/Auditor.h
+++ b/GaudiKernel/include/GaudiKernel/Auditor.h
@@ -50,7 +50,7 @@ public:
       @param svcloc  A pointer to a service location service */
   Auditor( std::string name, ISvcLocator* svcloc );
 
-  Auditor( const Auditor& a ) = delete;
+  Auditor( const Auditor& a )              = delete;
   Auditor& operator=( const Auditor& rhs ) = delete;
 
   /** Initialization method invoked by the framework. This method is responsible
diff --git a/GaudiKernel/include/GaudiKernel/Chrono.h b/GaudiKernel/include/GaudiKernel/Chrono.h
index d568c07bcf..f591ac80ee 100644
--- a/GaudiKernel/include/GaudiKernel/Chrono.h
+++ b/GaudiKernel/include/GaudiKernel/Chrono.h
@@ -153,7 +153,7 @@ public:
 private:
   // =========================================================================
   /// delete the copy constructor and assignment operators
-  Chrono( const Chrono& ) = delete;
+  Chrono( const Chrono& )            = delete;
   Chrono& operator=( const Chrono& ) = delete;
   // =========================================================================
 private:
diff --git a/GaudiKernel/include/GaudiKernel/ConversionSvc.h b/GaudiKernel/include/GaudiKernel/ConversionSvc.h
index 7384024370..0566299ddf 100644
--- a/GaudiKernel/include/GaudiKernel/ConversionSvc.h
+++ b/GaudiKernel/include/GaudiKernel/ConversionSvc.h
@@ -75,7 +75,7 @@ class GAUDI_API ConversionSvc : public extends<Service, IConversionSvc, IAddress
       return *this;
     }
 
-    WorkerEntry( const WorkerEntry& copy ) = delete;
+    WorkerEntry( const WorkerEntry& copy )            = delete;
     WorkerEntry& operator=( const WorkerEntry& copy ) = delete;
 
     IConverter* converter() { return m_converter; }
@@ -88,7 +88,7 @@ public:
   ConversionSvc( const std::string& name, ISvcLocator* svc, long type );
 
   /// disable copy and assignment
-  ConversionSvc( const ConversionSvc& ) = delete;
+  ConversionSvc( const ConversionSvc& )            = delete;
   ConversionSvc& operator=( const ConversionSvc& ) = delete;
 
   /// Initialize the service.
diff --git a/GaudiKernel/include/GaudiKernel/Guards.h b/GaudiKernel/include/GaudiKernel/Guards.h
index 00942cca59..a7676863e9 100644
--- a/GaudiKernel/include/GaudiKernel/Guards.h
+++ b/GaudiKernel/include/GaudiKernel/Guards.h
@@ -151,8 +151,8 @@ namespace Gaudi {
 
     private:
       // delete default/copy constructor and assignment
-      ExceptionGuard()                        = delete;
-      ExceptionGuard( const ExceptionGuard& ) = delete;
+      ExceptionGuard()                                   = delete;
+      ExceptionGuard( const ExceptionGuard& )            = delete;
       ExceptionGuard& operator=( const ExceptionGuard& ) = delete;
 
     protected:
@@ -240,8 +240,8 @@ namespace Gaudi {
 
     private:
       // delete the default/copy constructor and assigment
-      AuditorGuard()                            = delete;
-      AuditorGuard( const AuditorGuard& right ) = delete;
+      AuditorGuard()                                       = delete;
+      AuditorGuard( const AuditorGuard& right )            = delete;
       AuditorGuard& operator=( const AuditorGuard& right ) = delete;
 
     private:
diff --git a/GaudiKernel/include/GaudiKernel/IBinder.h b/GaudiKernel/include/GaudiKernel/IBinder.h
index d3dc589064..16fd7b1bce 100644
--- a/GaudiKernel/include/GaudiKernel/IBinder.h
+++ b/GaudiKernel/include/GaudiKernel/IBinder.h
@@ -43,10 +43,10 @@ namespace Gaudi::Interface::Bind {
     ~Box() {
       if ( m_destruct ) ( *m_destruct )( const_cast<IFace*>( m_ptr ) );
     }
-    Box( const Box& ) = delete;
+    Box( const Box& )            = delete;
     Box& operator=( const Box& ) = delete;
     Box( Box&& rhs )             = delete;
-    Box& operator=( Box&& ) = delete;
+    Box& operator=( Box&& )      = delete;
 
     operator IFace const&() const { return *m_ptr; }
     // operator IFace&() && = delete;
@@ -62,10 +62,10 @@ namespace Gaudi::Interface::Bind {
   struct AlgToolStub : IFace {
 
     using IFace::IFace;
-    AlgToolStub( const AlgToolStub& ) = delete;
+    AlgToolStub( const AlgToolStub& )            = delete;
     AlgToolStub& operator=( const AlgToolStub& ) = delete;
     AlgToolStub( AlgToolStub&& )                 = delete;
-    AlgToolStub& operator=( AlgToolStub&& ) = delete;
+    AlgToolStub& operator=( AlgToolStub&& )      = delete;
 
     const std::string& name() const override {
       static std::string s{ "<STUB>" };
diff --git a/GaudiKernel/include/GaudiKernel/IInterface.h b/GaudiKernel/include/GaudiKernel/IInterface.h
index 641b0d93f7..a024c14967 100644
--- a/GaudiKernel/include/GaudiKernel/IInterface.h
+++ b/GaudiKernel/include/GaudiKernel/IInterface.h
@@ -336,13 +336,13 @@ bool isValidInterface( IFace* i ) {
   return i->queryInterface( IFace::interfaceID(), &ii ).isSuccess();
 }
 
-//#ifdef GAUDI_V20_COMPAT
+// #ifdef GAUDI_V20_COMPAT
 /// ostream operator for InterfaceID. Needed by PluginSvc
 inline std::ostream& operator<<( std::ostream& s, const InterfaceID& id ) {
   s << "IID_" << id.id();
   return s;
 }
-//#endif
+// #endif
 
 /// Small function to be used instead of the construct (void**)&pointer, which
 /// produces, on gcc 4.1 optimized, the warning
diff --git a/GaudiKernel/include/GaudiKernel/KeyedObject.h b/GaudiKernel/include/GaudiKernel/KeyedObject.h
index c63bb0b7c8..7fc3b69801 100644
--- a/GaudiKernel/include/GaudiKernel/KeyedObject.h
+++ b/GaudiKernel/include/GaudiKernel/KeyedObject.h
@@ -47,11 +47,11 @@ protected:
   /// definition of the container key traits to be made friend
   typedef typename Containers::key_traits<key_type> traits;
   /// Allow the container traits to access full object properties
-  //#ifdef _WIN32
-  //  friend traits;
-  //#else
+  // #ifdef _WIN32
+  //   friend traits;
+  // #else
   friend struct Containers::key_traits<key_type>;
-  //#endif
+  // #endif
 
   /// Object Key
   key_type m_key{};
diff --git a/GaudiKernel/include/GaudiKernel/LinkManager.h b/GaudiKernel/include/GaudiKernel/LinkManager.h
index e6cb9d8275..08a0e7fb3a 100644
--- a/GaudiKernel/include/GaudiKernel/LinkManager.h
+++ b/GaudiKernel/include/GaudiKernel/LinkManager.h
@@ -80,10 +80,10 @@ private:
 
 public:
   /// Standard Constructor
-  LinkManager()                = default;
-  LinkManager( LinkManager&& ) = default;
-  LinkManager& operator=( LinkManager&& ) = default;
-  LinkManager( LinkManager const& )       = delete;
+  LinkManager()                                = default;
+  LinkManager( LinkManager&& )                 = default;
+  LinkManager& operator=( LinkManager&& )      = default;
+  LinkManager( LinkManager const& )            = delete;
   LinkManager& operator=( LinkManager const& ) = delete;
   /// Standard Destructor
   ~LinkManager();
diff --git a/GaudiKernel/include/GaudiKernel/ObjectContainerBase.h b/GaudiKernel/include/GaudiKernel/ObjectContainerBase.h
index c07f9ce58c..e94b803f41 100644
--- a/GaudiKernel/include/GaudiKernel/ObjectContainerBase.h
+++ b/GaudiKernel/include/GaudiKernel/ObjectContainerBase.h
@@ -30,8 +30,8 @@ class GAUDI_API ObjectContainerBase : public DataObject {
 
 protected:
   /// Constructor
-  ObjectContainerBase()                        = default;
-  ObjectContainerBase( ObjectContainerBase&& ) = default;
+  ObjectContainerBase()                                   = default;
+  ObjectContainerBase( ObjectContainerBase&& )            = default;
   ObjectContainerBase& operator=( ObjectContainerBase&& ) = default;
   ~ObjectContainerBase() override                         = default;
 
diff --git a/GaudiKernel/include/GaudiKernel/ObjectList.h b/GaudiKernel/include/GaudiKernel/ObjectList.h
index 29b707f94a..df2ebb0c1f 100644
--- a/GaudiKernel/include/GaudiKernel/ObjectList.h
+++ b/GaudiKernel/include/GaudiKernel/ObjectList.h
@@ -69,7 +69,7 @@ public:
   /// Constructors
   ObjectList() = default;
 
-  ObjectList( const ObjectList<TYPE>& ) = delete;
+  ObjectList( const ObjectList<TYPE>& )            = delete;
   ObjectList& operator=( const ObjectList<TYPE>& ) = delete;
 
   /// Destructor
diff --git a/GaudiKernel/include/GaudiKernel/ObjectVector.h b/GaudiKernel/include/GaudiKernel/ObjectVector.h
index 3c870e2fe9..80d9dde73c 100644
--- a/GaudiKernel/include/GaudiKernel/ObjectVector.h
+++ b/GaudiKernel/include/GaudiKernel/ObjectVector.h
@@ -67,8 +67,8 @@ public:
 
 public:
   /// Constructors
-  ObjectVector()                            = default;
-  ObjectVector( const ObjectVector<TYPE>& ) = delete;
+  ObjectVector()                                       = default;
+  ObjectVector( const ObjectVector<TYPE>& )            = delete;
   ObjectVector& operator=( const ObjectVector<TYPE>& ) = delete;
   ObjectVector( ObjectVector&& rhs ) : ObjectContainerBase( std::move( rhs ) ), m_vector{ std::move( rhs.m_vector ) } {
     std::for_each( begin(), end(), [this]( TYPE* obj ) { obj->setParent( this ); } );
diff --git a/GaudiKernel/include/GaudiKernel/PropertyHolder.h b/GaudiKernel/include/GaudiKernel/PropertyHolder.h
index cda02fa8d5..e159907bb9 100644
--- a/GaudiKernel/include/GaudiKernel/PropertyHolder.h
+++ b/GaudiKernel/include/GaudiKernel/PropertyHolder.h
@@ -96,7 +96,7 @@ public:
 
   /// \{
   /// prevent copies
-  PropertyHolder( const PropertyHolder& ) = delete;
+  PropertyHolder( const PropertyHolder& )            = delete;
   PropertyHolder& operator=( const PropertyHolder& ) = delete;
   /// \}
 
diff --git a/GaudiKernel/include/GaudiKernel/PropertyMgr.h b/GaudiKernel/include/GaudiKernel/PropertyMgr.h
index 83205b661f..c3ec1ded30 100644
--- a/GaudiKernel/include/GaudiKernel/PropertyMgr.h
+++ b/GaudiKernel/include/GaudiKernel/PropertyMgr.h
@@ -100,7 +100,7 @@ public:
   /** get the property
    *  @see IProperty
    */
-  StatusCode getProperty( Gaudi::Details::PropertyBase * p ) const override;
+  StatusCode getProperty( Gaudi::Details::PropertyBase* p ) const override;
   // ==========================================================================
   /** get the property by name
    *  @see IProperty
@@ -110,7 +110,7 @@ public:
   /** convert the property to the string
    *  @see IProperty
    */
-  StatusCode getProperty( std::string_view n, std::string & v ) const override;
+  StatusCode getProperty( std::string_view n, std::string& v ) const override;
   // ==========================================================================
   /** get all properties
    *  @see IProperty
diff --git a/GaudiKernel/include/GaudiKernel/SharedObjectsContainer.h b/GaudiKernel/include/GaudiKernel/SharedObjectsContainer.h
index 4967acfaf0..7ae5c5fb0f 100644
--- a/GaudiKernel/include/GaudiKernel/SharedObjectsContainer.h
+++ b/GaudiKernel/include/GaudiKernel/SharedObjectsContainer.h
@@ -56,7 +56,7 @@ public:
   // the default constructor (creates the empty vector)
   SharedObjectsContainer() = default;
   // move constructor and move assignement
-  SharedObjectsContainer( SharedObjectsContainer&& ) = default;
+  SharedObjectsContainer( SharedObjectsContainer&& )            = default;
   SharedObjectsContainer& operator=( SharedObjectsContainer&& ) = default;
   // the constructor from the data
   SharedObjectsContainer( const ConstVector& data ) : m_data( data ) {}
diff --git a/GaudiKernel/include/GaudiKernel/SmartIF.h b/GaudiKernel/include/GaudiKernel/SmartIF.h
index 44944a45e2..8bcb14cfcc 100644
--- a/GaudiKernel/include/GaudiKernel/SmartIF.h
+++ b/GaudiKernel/include/GaudiKernel/SmartIF.h
@@ -72,7 +72,7 @@ public:
   inline bool isValid() const { return m_interface != nullptr; }
 
   inline explicit operator bool() const { return isValid(); }
-  inline bool     operator!() const { return !isValid(); }
+  inline bool operator!() const { return !isValid(); }
 
   // ---------- Pointer access methods ----------
   /// Automatic conversion to pointer.
diff --git a/GaudiKernel/include/GaudiKernel/StreamBuffer.h b/GaudiKernel/include/GaudiKernel/StreamBuffer.h
index 52d4e9b3af..556899d95b 100644
--- a/GaudiKernel/include/GaudiKernel/StreamBuffer.h
+++ b/GaudiKernel/include/GaudiKernel/StreamBuffer.h
@@ -461,9 +461,7 @@ public:
     size_t      len = strlen( ptr ) + 1;
     if ( 0 == m_analyzer )
       writeBytes( ptr, len );
-    else {
-      STREAM_ANALYSE( data, len );
-    }
+    else { STREAM_ANALYSE( data, len ); }
     return *this;
   }
   /// Streamer to read strings in (std::string) format
diff --git a/GaudiKernel/include/GaudiKernel/TaggedBool.h b/GaudiKernel/include/GaudiKernel/TaggedBool.h
index 1dfd8a6606..600cd81434 100644
--- a/GaudiKernel/include/GaudiKernel/TaggedBool.h
+++ b/GaudiKernel/include/GaudiKernel/TaggedBool.h
@@ -28,7 +28,7 @@ namespace Gaudi {
       template <typename OtherTag>
       constexpr explicit tagged_bool( tagged_bool<OtherTag> b ) : value{ b.value } {}
 
-      constexpr explicit    operator bool() const { return value; }
+      constexpr explicit operator bool() const { return value; }
       constexpr tagged_bool operator!() const { return tagged_bool{ !value }; }
 
       friend constexpr bool operator==( tagged_bool l, tagged_bool r ) { return l.value == r.value; }
diff --git a/GaudiKernel/src/Lib/ConversionSvc.cpp b/GaudiKernel/src/Lib/ConversionSvc.cpp
index b0d525a3fa..5e0391cc83 100644
--- a/GaudiKernel/src/Lib/ConversionSvc.cpp
+++ b/GaudiKernel/src/Lib/ConversionSvc.cpp
@@ -297,9 +297,8 @@ StatusCode ConversionSvc::connectOutput( const std::string& /* outputFile */ ) {
 StatusCode ConversionSvc::commitOutput( const std::string&, bool ) { return StatusCode::SUCCESS; }
 
 /// Create a Generic address using explicit arguments to identify a single object.
-StatusCode ConversionSvc::createAddress( long /* svc_type */, const CLID& /* clid     */,
-                                         const std::string* /* par      */, const unsigned long* /* ip       */,
-                                         IOpaqueAddress*& refpAddress ) {
+StatusCode ConversionSvc::createAddress( long /* svc_type */, const CLID& /* clid     */, const std::string* /* par */,
+                                         const unsigned long* /* ip       */, IOpaqueAddress*& refpAddress ) {
   refpAddress = nullptr;
   return StatusCode::FAILURE;
 }
diff --git a/GaudiKernel/src/Lib/DataObjectHandleBase.cpp b/GaudiKernel/src/Lib/DataObjectHandleBase.cpp
index fa0458cd73..8462a29687 100644
--- a/GaudiKernel/src/Lib/DataObjectHandleBase.cpp
+++ b/GaudiKernel/src/Lib/DataObjectHandleBase.cpp
@@ -39,11 +39,11 @@ DataObjectHandleBase& DataObjectHandleBase::operator=( const DataObjectHandleBas
   auto guard = std::scoped_lock{ other.m_searchMutex };
   // FIXME: operator= should not change our owner, only our 'value'
   Gaudi::DataHandle::operator=( other );
-  m_EDS                      = other.m_EDS;
-  m_MS                       = other.m_MS;
-  m_init                     = other.m_init;
-  m_optional                 = other.m_optional;
-  m_searchDone               = other.m_searchDone.load();
+  m_EDS        = other.m_EDS;
+  m_MS         = other.m_MS;
+  m_init       = other.m_init;
+  m_optional   = other.m_optional;
+  m_searchDone = other.m_searchDone.load();
   return *this;
 }
 
diff --git a/GaudiKernel/src/Lib/DataSvc.cpp b/GaudiKernel/src/Lib/DataSvc.cpp
index 91029f8545..962c90e7b7 100644
--- a/GaudiKernel/src/Lib/DataSvc.cpp
+++ b/GaudiKernel/src/Lib/DataSvc.cpp
@@ -70,7 +70,7 @@ namespace {
 //
 // M.Frank
 #define CAST_REGENTRY( x, y ) dynamic_cast<x>( y )
-//#define CAST_REGENTRY(x,y) (x)(y)
+// #define CAST_REGENTRY(x,y) (x)(y)
 typedef DataSvcHelpers::RegistryEntry RegEntry;
 
 #define ON_DEBUG if ( msgLevel( MSG::DEBUG ) )
diff --git a/GaudiKernel/src/Lib/Message.cpp b/GaudiKernel/src/Lib/Message.cpp
index a7677d3cc1..249d8f11c9 100644
--- a/GaudiKernel/src/Lib/Message.cpp
+++ b/GaudiKernel/src/Lib/Message.cpp
@@ -30,20 +30,20 @@ namespace {
   }
 } // namespace
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: Constructor.
-// Purpose:
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: Constructor.
+//  Purpose:
+//  ---------------------------------------------------------------------------
 //
 Message::Message( const char* src, int type, const char* msg )
     : Message( std::string( src ), type, std::string( msg ) ) {}
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: Constructor.
-// Purpose:
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: Constructor.
+//  Purpose:
+//  ---------------------------------------------------------------------------
 //
 Message::Message( std::string src, int type, std::string msg )
     : m_message( std::move( msg ) ), m_source( std::move( src ) ), m_type( type ) {
@@ -55,11 +55,11 @@ Message::Message( std::string src, int type, std::string msg )
   m_ecThrd                = pthread_self();
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: operator <<
-// Purpose:Insert the message into a stream.
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: operator <<
+//  Purpose:Insert the message into a stream.
+//  ---------------------------------------------------------------------------
 //
 std::ostream& operator<<( std::ostream& stream, const Message& msg ) {
   msg.makeFormattedMsg( msg.m_format );
@@ -67,32 +67,32 @@ std::ostream& operator<<( std::ostream& stream, const Message& msg ) {
   return stream;
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: operator <
-// Purpose: comparison operator needed for maps
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: operator <
+//  Purpose: comparison operator needed for maps
+//  ---------------------------------------------------------------------------
 //
 bool operator<( const Message& lhs, const Message& rhs ) {
   return lhs.m_type < rhs.m_type || lhs.m_source < rhs.m_source || lhs.m_message < rhs.m_message;
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: operator ==
-// Purpose: comparison op.
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: operator ==
+//  Purpose: comparison op.
+//  ---------------------------------------------------------------------------
 //
 bool operator==( const Message& a, const Message& b ) {
   return a.m_source == b.m_source && a.m_type == b.m_type && a.m_message == b.m_message;
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine:
-// Purpose: Set the format string -
-//          use isFormatted() to check for valid format.
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine:
+//  Purpose: Set the format string -
+//           use isFormatted() to check for valid format.
+//  ---------------------------------------------------------------------------
 //
 void Message::setFormat( std::string format ) const {
   if ( !format.empty() ) {
@@ -102,22 +102,22 @@ void Message::setFormat( std::string format ) const {
   }
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine:
-// Purpose: Set the time format string -
-//          use isFormatted() to check for valid format.
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine:
+//  Purpose: Set the time format string -
+//           use isFormatted() to check for valid format.
+//  ---------------------------------------------------------------------------
 //
 void Message::setTimeFormat( std::string timeFormat ) const {
   m_time_format = ( timeFormat.empty() ? DEFAULT_TIME_FORMAT : std::move( timeFormat ) );
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: makeFormattedMsg
-// Purpose: This formats the message according to the format string.
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: makeFormattedMsg
+//  Purpose: This formats the message according to the format string.
+//  ---------------------------------------------------------------------------
 //
 void Message::makeFormattedMsg( const std::string& format ) const {
   m_formatted_msg.clear();
@@ -150,11 +150,11 @@ void Message::makeFormattedMsg( const std::string& format ) const {
   }
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: decodeFormat
-// Purpose: This the work horse that checks for a valid format string.
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: decodeFormat
+//  Purpose: This the work horse that checks for a valid format string.
+//  ---------------------------------------------------------------------------
 //
 void Message::decodeFormat( const std::string& format ) const {
   if ( !format.empty() ) {
@@ -261,20 +261,20 @@ void Message::decodeFormat( const std::string& format ) const {
     invalidFormat();
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: invalidFormat.
-// Purpose: called when invalid format found.
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: invalidFormat.
+//  Purpose: called when invalid format found.
+//  ---------------------------------------------------------------------------
 //
 
 void Message::invalidFormat() const { makeFormattedMsg( DEFAULT_FORMAT ); }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: setWidth
-// Purpose: Sets the minimum width of a stream field.
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: setWidth
+//  Purpose: Sets the minimum width of a stream field.
+//  ---------------------------------------------------------------------------
 //
 namespace {
   // Check that a container only contains digits.
@@ -295,11 +295,11 @@ void Message::setWidth( const std::string& formatArg ) const {
     invalidFormat();
 }
 
-//#############################################################################
-// ---------------------------------------------------------------------------
-// Routine: sizeField
-// Purpose: Truncates or pads the text to m_width as necessary
-// ---------------------------------------------------------------------------
+// #############################################################################
+//  ---------------------------------------------------------------------------
+//  Routine: sizeField
+//  Purpose: Truncates or pads the text to m_width as necessary
+//  ---------------------------------------------------------------------------
 //
 
 void Message::sizeField( const std::string& text, bool middle ) const {
diff --git a/GaudiKernel/src/Lib/ModuleInfo.cpp b/GaudiKernel/src/Lib/ModuleInfo.cpp
index 4c4e56ed5d..c35f51f435 100644
--- a/GaudiKernel/src/Lib/ModuleInfo.cpp
+++ b/GaudiKernel/src/Lib/ModuleInfo.cpp
@@ -22,11 +22,11 @@
 //====================================================================
 #define SYSTEM_MODULEINFO_CPP
 
-//#include <ctime>
+// #include <ctime>
 #include <cstdlib>
 #include <cstring>
-//#include <iostream>
-//#include <typeinfo>
+// #include <iostream>
+// #include <typeinfo>
 
 #include "GaudiKernel/ModuleInfo.h"
 #include "GaudiKernel/System.h"
diff --git a/GaudiKernel/src/Lib/ProcessDescriptor.cpp b/GaudiKernel/src/Lib/ProcessDescriptor.cpp
index 12715b5423..da7700e8e3 100644
--- a/GaudiKernel/src/Lib/ProcessDescriptor.cpp
+++ b/GaudiKernel/src/Lib/ProcessDescriptor.cpp
@@ -349,8 +349,8 @@ void readProcStat( long pid, linux_proc& pinfo ) {
 }
 #endif
 
-  // static long s_myPid  = ::getpid();
-  // In order to properly support e.g. fork() calls, we cannot keep a copy of the pid!
+// static long s_myPid  = ::getpid();
+// In order to properly support e.g. fork() calls, we cannot keep a copy of the pid!
 
 #ifndef __APPLE__
 static inline long processID( long pid ) { return ( pid > 0 ) ? pid : ( ::getpid() ); }
diff --git a/GaudiKernel/src/Lib/RegistryEntry.cpp b/GaudiKernel/src/Lib/RegistryEntry.cpp
index 7fb3e1906e..7f641ee4c5 100644
--- a/GaudiKernel/src/Lib/RegistryEntry.cpp
+++ b/GaudiKernel/src/Lib/RegistryEntry.cpp
@@ -46,7 +46,7 @@
 // M.Frank
 //
 #define CAST_REGENTRY( x, y ) dynamic_cast<x>( y )
-//#define CAST_REGENTRY(x,y) (x)(y)
+// #define CAST_REGENTRY(x,y) (x)(y)
 constexpr char SEPARATOR{ '/' };
 
 /// Standard Constructor
diff --git a/GaudiKernel/src/Lib/Time.cpp b/GaudiKernel/src/Lib/Time.cpp
index 88c27834f7..cb77b2c96d 100644
--- a/GaudiKernel/src/Lib/Time.cpp
+++ b/GaudiKernel/src/Lib/Time.cpp
@@ -69,7 +69,7 @@ using namespace Gaudi;
     in total 134774 * 86400 = 11644473600 seconds.  For the actual
     bias this needs to be multiplied by 10000000 since Windows time
     uses 100ns resolution, not seconds.  */
-//# define SECS_1601_TO_1970	((369 * 365 + 89) * SECS_PER_DAY)
+// # define SECS_1601_TO_1970	((369 * 365 + 89) * SECS_PER_DAY)
 #  define SECS_1601_TO_1970 ( ( 369 * 365 + 89 ) * 86400ui64 )
 #endif
 
diff --git a/GaudiKernel/src/Lib/TsDataSvc.cpp b/GaudiKernel/src/Lib/TsDataSvc.cpp
index 065fba3c0c..fd97e9d5fa 100644
--- a/GaudiKernel/src/Lib/TsDataSvc.cpp
+++ b/GaudiKernel/src/Lib/TsDataSvc.cpp
@@ -73,7 +73,7 @@ namespace {
 //
 // M.Frank
 #define CAST_REGENTRY( x, y ) dynamic_cast<x>( y )
-//#define CAST_REGENTRY(x,y) (x)(y)
+// #define CAST_REGENTRY(x,y) (x)(y)
 typedef DataSvcHelpers::RegistryEntry RegEntry;
 
 #define ON_DEBUG if ( msgLevel( MSG::DEBUG ) )
diff --git a/GaudiKernel/tests/src/test_GaudiTime.cpp b/GaudiKernel/tests/src/test_GaudiTime.cpp
index ce54caf530..74e397257b 100644
--- a/GaudiKernel/tests/src/test_GaudiTime.cpp
+++ b/GaudiKernel/tests/src/test_GaudiTime.cpp
@@ -26,8 +26,8 @@
 
 // to produce one line per test
 #include <cppunit/TestResult.h>
-//#include <cppunit/BriefTestProgressListener.h>
-//#include <cppunit/TestResultCollector.h>
+// #include <cppunit/BriefTestProgressListener.h>
+// #include <cppunit/TestResultCollector.h>
 
 // needed by the implementation of cool::ProgressListener
 #include <cppunit/Test.h>
diff --git a/GaudiKernel/tests/src/test_GaudiTiming.cpp b/GaudiKernel/tests/src/test_GaudiTiming.cpp
index 0a74238e47..b66e5a1401 100644
--- a/GaudiKernel/tests/src/test_GaudiTiming.cpp
+++ b/GaudiKernel/tests/src/test_GaudiTiming.cpp
@@ -30,8 +30,8 @@
 
 // to produce one line per test
 #include <cppunit/TestResult.h>
-//#include <cppunit/BriefTestProgressListener.h>
-//#include <cppunit/TestResultCollector.h>
+// #include <cppunit/BriefTestProgressListener.h>
+// #include <cppunit/TestResultCollector.h>
 
 // needed by the implementation of cool::ProgressListener
 #include <cppunit/Test.h>
diff --git a/GaudiKernel/tests/src/test_SerializeSTL.cpp b/GaudiKernel/tests/src/test_SerializeSTL.cpp
index 7294701391..4d228268a7 100644
--- a/GaudiKernel/tests/src/test_SerializeSTL.cpp
+++ b/GaudiKernel/tests/src/test_SerializeSTL.cpp
@@ -19,8 +19,8 @@
 
 // to produce one line per test
 #include <cppunit/TestResult.h>
-//#include <cppunit/BriefTestProgressListener.h>
-//#include <cppunit/TestResultCollector.h>
+// #include <cppunit/BriefTestProgressListener.h>
+// #include <cppunit/TestResultCollector.h>
 
 // needed by the implementation of cool::ProgressListener
 #include <cppunit/Test.h>
diff --git a/GaudiPartProp/src/ParticlePropertySvc.cpp b/GaudiPartProp/src/ParticlePropertySvc.cpp
index 5741b01dca..495b2216d6 100644
--- a/GaudiPartProp/src/ParticlePropertySvc.cpp
+++ b/GaudiPartProp/src/ParticlePropertySvc.cpp
@@ -29,7 +29,7 @@ namespace ba = boost::algorithm;
 #include "GaudiKernel/PhysicalConstants.h"
 #include "GaudiKernel/System.h"
 // ============================================================================
-//#include "GaudiKernel/ToStream.h"
+// #include "GaudiKernel/ToStream.h"
 // ============================================================================
 // Local
 // ============================================================================
diff --git a/GaudiProfiling/src/component/PerfMonAuditor.cpp b/GaudiProfiling/src/component/PerfMonAuditor.cpp
index 1ded167a4b..32b82db7a8 100644
--- a/GaudiProfiling/src/component/PerfMonAuditor.cpp
+++ b/GaudiProfiling/src/component/PerfMonAuditor.cpp
@@ -404,9 +404,7 @@ private:
   void pfm_bv_copy( uint64_t* d, uint64_t* j, uint16_t n ) {
     if ( n <= BPL )
       *d = *j;
-    else {
-      memcpy( d, j, ( n >> LBPL ) * sizeof( uint64_t ) );
-    }
+    else { memcpy( d, j, ( n >> LBPL ) * sizeof( uint64_t ) ); }
   }
   static void process_smpl_buf( pfm_dfl_smpl_hdr_t* hdr, size_t entry_size );
   static void sigio_handler( int, siginfo_t*, void* ); // dlopen ==>
@@ -579,9 +577,7 @@ StatusCode PerfMonAuditor::initialize() {
     nehalem = true;
   else if ( family.compare( "WESTMERE" ) == 0 )
     westmere = true;
-  else {
-    error() << "ERROR: Unsupported processor family " << family << ". aborting..." << endmsg;
-  }
+  else { error() << "ERROR: Unsupported processor family " << family << ". aborting..." << endmsg; }
 
   info() << "Initialized!" << endmsg;
   return StatusCode::SUCCESS;
diff --git a/GaudiProfiling/src/component/valgrind/local_valgrind.h b/GaudiProfiling/src/component/valgrind/local_valgrind.h
index 0006d625a9..85307aea19 100644
--- a/GaudiProfiling/src/component/valgrind/local_valgrind.h
+++ b/GaudiProfiling/src/component/valgrind/local_valgrind.h
@@ -338,7 +338,7 @@ static __inline uintptr_t valgrind_do_client_request_expr( uintptr_t _zzq_defaul
 #      define VALGRIND_VEX_INJECT_IR()                                                                                 \
         do {                                                                                                           \
           __asm { __SPECIAL_INSTRUCTION_PREAMBLE                       \
-            __asm xchg edi,edi }                                                 \
+            __asm xchg edi,edi }                                                  \
         } while ( 0 )
 
 #    else
diff --git a/GaudiSvc/src/DetectorDataSvc/DetDataSvc.h b/GaudiSvc/src/DetectorDataSvc/DetDataSvc.h
index 384e0e496a..92ff9a4199 100644
--- a/GaudiSvc/src/DetectorDataSvc/DetDataSvc.h
+++ b/GaudiSvc/src/DetectorDataSvc/DetDataSvc.h
@@ -12,7 +12,7 @@
 #define DETECTORDATASVC_DETDATASVC_H
 
 // Base classes
-//#include "GaudiKernel/DataSvc.h"
+// #include "GaudiKernel/DataSvc.h"
 // D. Piparo: Change to the new thread safe version
 #include "GaudiKernel/IDetDataSvc.h"
 #include "GaudiKernel/IIncidentListener.h"
diff --git a/GaudiSvc/src/THistSvc/THistSvc.h b/GaudiSvc/src/THistSvc/THistSvc.h
index 2d2e686cd4..62f56fc229 100644
--- a/GaudiSvc/src/THistSvc/THistSvc.h
+++ b/GaudiSvc/src/THistSvc/THistSvc.h
@@ -25,7 +25,7 @@
 #include "GaudiKernel/MsgStream.h"
 #include "GaudiKernel/Service.h"
 
-// ROOT includes:
+//  ROOT includes:
 #include "TEfficiency.h"
 #include "TGraph.h"
 #include "TH1.h"
diff --git a/GaudiUtils/src/component/XMLFileCatalog.cpp b/GaudiUtils/src/component/XMLFileCatalog.cpp
index 7702832fc0..d2ef262eac 100644
--- a/GaudiUtils/src/component/XMLFileCatalog.cpp
+++ b/GaudiUtils/src/component/XMLFileCatalog.cpp
@@ -90,9 +90,9 @@ namespace {
         if ( m_node && m_node->getNodeType() != DOMNode::ELEMENT_NODE ) ++( *this );
       }
     }
-                operator bool() const { return m_node; }
-                operator DOMNode*() const { return m_node; }
-                operator DOMElement*() const { return m_node; }
+    operator bool() const { return m_node; }
+    operator DOMNode*() const { return m_node; }
+    operator DOMElement*() const { return m_node; }
     DOMElement* operator->() const { return m_node; }
     string      attr( const XMLTag& tag ) const { return _toString( m_node->getAttribute( tag ) ); }
     string      attr( CSTR tag ) const { return attr( XMLTag( tag ) ); }
diff --git a/RootCnv/include/RootCnv/RootCnvSvc.h b/RootCnv/include/RootCnv/RootCnvSvc.h
index 29b3cac5bc..93ee1e833d 100644
--- a/RootCnv/include/RootCnv/RootCnvSvc.h
+++ b/RootCnv/include/RootCnv/RootCnvSvc.h
@@ -37,7 +37,7 @@ class TClass;
 #include "TROOT.h"
 #include "TTree.h"
 
-//#include "RootCnv/RootPerfMonSvc.h"
+// #include "RootCnv/RootPerfMonSvc.h"
 
 /*
  * Gaudi namespace declaration
diff --git a/RootCnv/src/RootUtils.h b/RootCnv/src/RootUtils.h
index e8bf976e7c..83f58e24c3 100644
--- a/RootCnv/src/RootUtils.h
+++ b/RootCnv/src/RootUtils.h
@@ -12,7 +12,7 @@
 #define GAUDIROOTCNV_ROOTUTILS_H
 
 // Framework include files
-//#include "GaudiKernel/DataObject.h"
+// #include "GaudiKernel/DataObject.h"
 
 // Forward declarations
 class DataObject;
-- 
GitLab