From c249daf37ccee980b58d717c0484d842e3913c83 Mon Sep 17 00:00:00 2001 From: Shahzad Malik Muzaffar Date: Thu, 5 Sep 2024 16:11:11 +0200 Subject: [PATCH] [CORE] Changes suggested by new llvm18 clang-format --- .../Common/interface/DetSetVectorNew.h | 2 +- .../Common/interface/ELseverityLevel.h | 2 +- DataFormats/Common/interface/PtrVector.h | 2 +- DataFormats/Common/test/Wrapper_t.cpp | 14 ++----- DataFormats/FWLite/interface/Event.h | 3 +- DataFormats/FWLite/interface/OutputFiles.h | 2 +- DataFormats/FWLite/src/ChainEvent.cc | 2 +- DataFormats/FWLite/src/Event.cc | 6 +-- .../TestObjects/interface/DeleteEarly.h | 2 +- FWCore/Concurrency/interface/WaitingTask.h | 2 +- FWCore/Concurrency/test/test_catch2_Async.cc | 12 ++---- .../test/test_catch2_WaitingThreadPool.cc | 18 +++----- FWCore/Framework/interface/ESProducts.h | 2 +- FWCore/Framework/interface/HCMethods.h | 2 +- FWCore/Framework/interface/HCTypeTag.h | 2 +- .../global/analyzerAbilityToImplementor.h | 2 +- .../global/filterAbilityToImplementor.h | 2 +- .../Framework/interface/global/implementors.h | 32 +++++++------- .../global/outputmoduleAbilityToImplementor.h | 10 ++--- .../global/producerAbilityToImplementor.h | 2 +- .../limited/analyzerAbilityToImplementor.h | 2 +- .../limited/filterAbilityToImplementor.h | 2 +- .../interface/limited/implementors.h | 32 +++++++------- .../outputmoduleAbilityToImplementor.h | 8 ++-- .../limited/producerAbilityToImplementor.h | 2 +- .../one/analyzerAbilityToImplementor.h | 2 +- .../one/filterAbilityToImplementor.h | 2 +- FWCore/Framework/interface/one/implementors.h | 26 ++++++------ .../one/outputmoduleAbilityToImplementor.h | 12 +++--- .../one/producerAbilityToImplementor.h | 2 +- .../interface/stream/dummy_helpers.h | 2 +- .../Framework/interface/stream/implementors.h | 12 +++--- .../Framework/interface/stream/makeGlobal.h | 2 +- FWCore/Framework/src/EventSetupProvider.cc | 2 +- FWCore/Framework/src/HCTypeTag.cc | 2 +- .../src/LuminosityBlockProcessingStatus.h | 2 +- .../src/MergeableRunProductMetadata.cc | 2 +- .../src/global/analyzerImplementors.cc | 2 +- .../src/global/filterImplementors.cc | 2 +- .../src/global/implementorsMethods.h | 2 +- .../src/global/outputmoduleImplementors.cc | 2 +- .../src/global/producerImplementors.cc | 2 +- .../src/limited/analyzerImplementors.cc | 2 +- .../src/limited/filterImplementors.cc | 2 +- .../src/limited/implementorsMethods.h | 2 +- .../src/limited/outputmoduleImplementors.cc | 2 +- .../src/limited/producerImplementors.cc | 2 +- .../Framework/src/one/analyzerImplementors.cc | 2 +- .../Framework/src/one/filterImplementors.cc | 2 +- .../Framework/src/one/implementorsMethods.h | 2 +- .../src/one/outputmoduleImplementors.cc | 2 +- .../Framework/src/one/producerImplementors.cc | 2 +- .../plugins/DelayedReaderThrowingSource.cc | 4 +- .../plugins/TestInterProcessProd.cc | 5 ++- .../plugins/TestInterProcessRandomProd.cc | 5 ++- .../MessageLogger/interface/ELseverityLevel.h | 2 +- .../MessageLogger/interface/MessageLoggerQ.h | 2 +- FWCore/MessageService/src/ELoutput.cc | 2 +- FWCore/MessageService/src/ELstatistics.cc | 4 +- .../src/ThreadSafeLogMessageLoggerScribe.cc | 2 +- FWCore/SOA/interface/tablehelpers.h | 2 +- FWCore/Services/plugins/UnixSignalService.cc | 2 +- .../interface/ReusableObjectHolder.h | 5 +-- FWCore/Utilities/interface/VecArray.h | 4 +- FWCore/Utilities/interface/transform.h | 5 ++- FWCore/Utilities/src/EDMException.cc | 3 +- .../test/reusableobjectholder_t.cppunit.cpp | 20 ++++----- .../plugins/RandomNumberGeneratorService.cc | 2 +- IOPool/Input/src/RootTree.cc | 2 +- .../interface/TimeoutPoolOutputModule.h | 2 +- .../interface/StreamerOutputModuleBase.h | 2 +- .../interface/StreamerOutputModuleCommon.h | 2 +- .../interface/StreamerOutputMsgBuilders.h | 2 +- IOPool/Streamer/src/StreamerFileWriter.h | 2 +- IOPool/TFileAdaptor/src/ReadRepacker.h | 2 +- .../test/test_catch2_AllocMonitorRegistry.cc | 9 ++-- .../AllocMonitorPreload/src/memory_proxies.cc | 42 +++++++------------ Utilities/XrdAdaptor/src/XrdRequestManager.h | 2 +- 78 files changed, 182 insertions(+), 219 deletions(-) diff --git a/DataFormats/Common/interface/DetSetVectorNew.h b/DataFormats/Common/interface/DetSetVectorNew.h index 041098a000b9f..02f5cb1dba9ea 100644 --- a/DataFormats/Common/interface/DetSetVectorNew.h +++ b/DataFormats/Common/interface/DetSetVectorNew.h @@ -690,7 +690,7 @@ namespace edm { typedef FindSetForNewDetSetVector value; }; } // namespace refhelper - /* ... implementation is provided, just in case it's needed */ + /* ... implementation is provided, just in case it's needed */ } // namespace edm namespace edmNew { diff --git a/DataFormats/Common/interface/ELseverityLevel.h b/DataFormats/Common/interface/ELseverityLevel.h index 012b4124259a0..87efd7a71e1d1 100644 --- a/DataFormats/Common/interface/ELseverityLevel.h +++ b/DataFormats/Common/interface/ELseverityLevel.h @@ -41,7 +41,7 @@ namespace edm { ELsev_highestSeverity, // threshold use only // ----- nLevels // how many levels? - }; // ELsev_ + }; // ELsev_ // ----- Birth/death: // diff --git a/DataFormats/Common/interface/PtrVector.h b/DataFormats/Common/interface/PtrVector.h index 0d414ee1451af..fd878baa173e7 100644 --- a/DataFormats/Common/interface/PtrVector.h +++ b/DataFormats/Common/interface/PtrVector.h @@ -65,7 +65,7 @@ namespace edm { Ptr const operator[](difference_type n) const { // Otherwise the return base_->fromItr(iter_ + n); // boost::range - } // doesn't have [] + } // doesn't have [] PtrHolder operator->() const { return PtrHolder(this->operator*()); } diff --git a/DataFormats/Common/test/Wrapper_t.cpp b/DataFormats/Common/test/Wrapper_t.cpp index 2972278a0b764..53de087741a9b 100644 --- a/DataFormats/Common/test/Wrapper_t.cpp +++ b/DataFormats/Common/test/Wrapper_t.cpp @@ -14,11 +14,8 @@ class CopyNoMove { public: CopyNoMove() {} - CopyNoMove(CopyNoMove const&) { /* std::cout << "copied\n"; */ - } - CopyNoMove& operator=(CopyNoMove const&) { /*std::cout << "assigned\n";*/ - return *this; - } + CopyNoMove(CopyNoMove const&) { /* std::cout << "copied\n"; */ } + CopyNoMove& operator=(CopyNoMove const&) { /*std::cout << "assigned\n";*/ return *this; } private: }; @@ -28,11 +25,8 @@ class MoveNoCopy { MoveNoCopy() {} MoveNoCopy(MoveNoCopy const&) = delete; MoveNoCopy& operator=(MoveNoCopy const&) = delete; - MoveNoCopy(MoveNoCopy&&) { /* std::cout << "moved\n";*/ - } - MoveNoCopy& operator=(MoveNoCopy&&) { /* std::cout << "moved\n";*/ - return *this; - } + MoveNoCopy(MoveNoCopy&&) { /* std::cout << "moved\n";*/ } + MoveNoCopy& operator=(MoveNoCopy&&) { /* std::cout << "moved\n";*/ return *this; } private: }; diff --git a/DataFormats/FWLite/interface/Event.h b/DataFormats/FWLite/interface/Event.h index efbda24c222e0..8ff14667ddfc8 100644 --- a/DataFormats/FWLite/interface/Event.h +++ b/DataFormats/FWLite/interface/Event.h @@ -100,8 +100,7 @@ namespace fwlite { // DataGetterHelper caching is enabled. When user sets useCache to // false no cache is created unless user attaches and controls it // himself. - Event( - TFile* iFile, bool useCache = true, std::function baFunc = [](TBranch const&) {}); + Event(TFile* iFile, bool useCache = true, std::function baFunc = [](TBranch const&) {}); Event(Event const&) = delete; // stop default diff --git a/DataFormats/FWLite/interface/OutputFiles.h b/DataFormats/FWLite/interface/OutputFiles.h index e701265c8af23..ee26c147176a9 100644 --- a/DataFormats/FWLite/interface/OutputFiles.h +++ b/DataFormats/FWLite/interface/OutputFiles.h @@ -22,7 +22,7 @@ namespace fwlite { OutputFiles() { throw cms::Exception("InvalidInput") << "Must specify a string fileName" << std::endl; } /// default constructor from parameter set OutputFiles(const edm::ParameterSet& cfg) - : file_(cfg.getParameterSet("fwliteOutput").getParameter("fileName")){}; + : file_(cfg.getParameterSet("fwliteOutput").getParameter("fileName")) {} /// return output fuke name std::string const& file() const { return file_; } diff --git a/DataFormats/FWLite/src/ChainEvent.cc b/DataFormats/FWLite/src/ChainEvent.cc index 2e316d027146b..88bd926c8f608 100644 --- a/DataFormats/FWLite/src/ChainEvent.cc +++ b/DataFormats/FWLite/src/ChainEvent.cc @@ -156,7 +156,7 @@ namespace fwlite { return true; } } // end ignore "first" file that we tried - } // end loop over files + } // end loop over files // did not find the event with id "id". return false; diff --git a/DataFormats/FWLite/src/Event.cc b/DataFormats/FWLite/src/Event.cc index d7c792a5c64ae..630d0025f99f9 100644 --- a/DataFormats/FWLite/src/Event.cc +++ b/DataFormats/FWLite/src/Event.cc @@ -108,9 +108,9 @@ namespace fwlite { Event const* event_; }; } // namespace internal - // - // constructors and destructor - // + // + // constructors and destructor + // Event::Event(TFile* iFile, bool useCache, std::function baFunc) : file_(iFile), // eventTree_(nullptr), diff --git a/DataFormats/TestObjects/interface/DeleteEarly.h b/DataFormats/TestObjects/interface/DeleteEarly.h index 6082a81eaae41..cb5efa2bc2f3d 100644 --- a/DataFormats/TestObjects/interface/DeleteEarly.h +++ b/DataFormats/TestObjects/interface/DeleteEarly.h @@ -26,7 +26,7 @@ namespace edmtest { class DeleteEarly { public: - DeleteEarly(){}; + DeleteEarly() {} ~DeleteEarly() { ++s_nDeletes; } // ---------- const member functions --------------------- diff --git a/FWCore/Concurrency/interface/WaitingTask.h b/FWCore/Concurrency/interface/WaitingTask.h index 4895b01ab9c0d..cc60e060f3598 100644 --- a/FWCore/Concurrency/interface/WaitingTask.h +++ b/FWCore/Concurrency/interface/WaitingTask.h @@ -41,7 +41,7 @@ namespace edm { ///Constructor WaitingTask() noexcept : m_ptr{} {} - ~WaitingTask() noexcept override{}; + ~WaitingTask() noexcept override {} // ---------- const member functions --------------------------- diff --git a/FWCore/Concurrency/test/test_catch2_Async.cc b/FWCore/Concurrency/test/test_catch2_Async.cc index b42a276a6d541..0c02282a2fe10 100644 --- a/FWCore/Concurrency/test/test_catch2_Async.cc +++ b/FWCore/Concurrency/test/test_catch2_Async.cc @@ -48,15 +48,13 @@ TEST_CASE("Test Async", "[edm::Async") { using namespace edm::waiting_task::chain; auto h1 = first([&service, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - service.runAsync( - h2, [&count]() { ++count; }, errorContext); + service.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); auto h2 = first([&service, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - service.runAsync( - h2, [&count]() { ++count; }, errorContext); + service.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h2.doneWaiting(std::exception_ptr()); @@ -79,14 +77,12 @@ TEST_CASE("Test Async", "[edm::Async") { using namespace edm::waiting_task::chain; auto h = first([&service, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - service.runAsync( - h2, [&count]() { ++count; }, errorContext); + service.runAsync(h2, [&count]() { ++count; }, errorContext); service.setAllowed(false); }) | then([&service, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - service.runAsync( - h2, [&count]() { ++count; }, errorContext); + service.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h.doneWaiting(std::exception_ptr()); diff --git a/FWCore/Concurrency/test/test_catch2_WaitingThreadPool.cc b/FWCore/Concurrency/test/test_catch2_WaitingThreadPool.cc index 063b00761a615..c6ad896ce79ba 100644 --- a/FWCore/Concurrency/test/test_catch2_WaitingThreadPool.cc +++ b/FWCore/Concurrency/test/test_catch2_WaitingThreadPool.cc @@ -28,8 +28,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { using namespace edm::waiting_task::chain; auto h = first([&pool, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - pool.runAsync( - std::move(h2), [&count]() { ++count; }, errorContext); + pool.runAsync(std::move(h2), [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h.doneWaiting(std::exception_ptr()); @@ -62,8 +61,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { ++count; }, errorContext); - pool.runAsync( - h2, [&count]() { ++count; }, errorContext); + pool.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h.doneWaiting(std::exception_ptr()); @@ -90,8 +88,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { while (mayContinue != 2) { hardware_pause(); } - pool.runAsync( - h2, [&count]() { ++count; }, errorContext); + pool.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); @@ -101,8 +98,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { while (mayContinue != 2) { hardware_pause(); } - pool.runAsync( - h2, [&count]() { ++count; }, errorContext); + pool.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h2.doneWaiting(std::exception_ptr()); @@ -125,8 +121,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { using namespace edm::waiting_task::chain; auto h = first([&pool](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - pool.runAsync( - std::move(h2), []() { throw std::runtime_error("error"); }, errorContext); + pool.runAsync(std::move(h2), []() { throw std::runtime_error("error"); }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h.doneWaiting(std::exception_ptr()); @@ -265,8 +260,7 @@ TEST_CASE("Test WaitingThreadPool", "[edm::WaitingThreadPool") { auto h2 = first([&pool, &count](edm::WaitingTaskHolder h) { edm::WaitingTaskWithArenaHolder h2(std::move(h)); - pool.runAsync( - h2, [&count]() { ++count; }, errorContext); + pool.runAsync(h2, [&count]() { ++count; }, errorContext); }) | lastTask(edm::WaitingTaskHolder(group, &waitTask)); h2.doneWaiting(std::exception_ptr()); diff --git a/FWCore/Framework/interface/ESProducts.h b/FWCore/Framework/interface/ESProducts.h index 961bd23163059..3ec8975ddf594 100644 --- a/FWCore/Framework/interface/ESProducts.h +++ b/FWCore/Framework/interface/ESProducts.h @@ -98,7 +98,7 @@ namespace edm { }; } // namespace produce - } // namespace eventsetup + } // namespace eventsetup struct ESFillDirectly {}; template diff --git a/FWCore/Framework/interface/HCMethods.h b/FWCore/Framework/interface/HCMethods.h index 488b29664f89f..08191b607295f 100644 --- a/FWCore/Framework/interface/HCMethods.h +++ b/FWCore/Framework/interface/HCMethods.h @@ -69,6 +69,6 @@ namespace edm { return static_cast(iStorage.find(makeKey::Type, Key>())); } } // namespace heterocontainer - } // namespace eventsetup + } // namespace eventsetup } // namespace edm #endif diff --git a/FWCore/Framework/interface/HCTypeTag.h b/FWCore/Framework/interface/HCTypeTag.h index 78969a3659be8..f72eafdce6ac7 100644 --- a/FWCore/Framework/interface/HCTypeTag.h +++ b/FWCore/Framework/interface/HCTypeTag.h @@ -64,7 +64,7 @@ namespace edm { char const* m_name{""}; }; } // namespace heterocontainer - } // namespace eventsetup + } // namespace eventsetup } // namespace edm #define HCTYPETAG_HELPER_METHODS(_dataclass_) TYPELOOKUP_METHODS(_dataclass_) diff --git a/FWCore/Framework/interface/global/analyzerAbilityToImplementor.h b/FWCore/Framework/interface/global/analyzerAbilityToImplementor.h index b29311d6f0652..d3c8fc3ba34f1 100644 --- a/FWCore/Framework/interface/global/analyzerAbilityToImplementor.h +++ b/FWCore/Framework/interface/global/analyzerAbilityToImplementor.h @@ -67,7 +67,7 @@ namespace edm { using Type = edm::global::impl::WatchProcessBlock; }; } // namespace analyzer - } // namespace global + } // namespace global } // namespace edm #endif diff --git a/FWCore/Framework/interface/global/filterAbilityToImplementor.h b/FWCore/Framework/interface/global/filterAbilityToImplementor.h index e6e9eadd3b203..5ab43aff4df96 100644 --- a/FWCore/Framework/interface/global/filterAbilityToImplementor.h +++ b/FWCore/Framework/interface/global/filterAbilityToImplementor.h @@ -131,7 +131,7 @@ namespace edm { using Type = edm::global::impl::EmptyType; }; } // namespace filter - } // namespace global + } // namespace global } // namespace edm #endif diff --git a/FWCore/Framework/interface/global/implementors.h b/FWCore/Framework/interface/global/implementors.h index 626c65e964848..6f85763a2a7fd 100644 --- a/FWCore/Framework/interface/global/implementors.h +++ b/FWCore/Framework/interface/global/implementors.h @@ -156,7 +156,7 @@ namespace edm { RunCacheHolder() = default; RunCacheHolder(RunCacheHolder const&) = delete; RunCacheHolder& operator=(RunCacheHolder const&) = delete; - ~RunCacheHolder() noexcept(false) override{}; + ~RunCacheHolder() noexcept(false) override {} protected: void preallocRuns(unsigned int iNRuns) final { caches_.reset(new std::shared_ptr[iNRuns]); } @@ -181,7 +181,7 @@ namespace edm { LuminosityBlockCacheHolder() = default; LuminosityBlockCacheHolder(LuminosityBlockCacheHolder const&) = delete; LuminosityBlockCacheHolder& operator=(LuminosityBlockCacheHolder const&) = delete; - ~LuminosityBlockCacheHolder() noexcept(false) override{}; + ~LuminosityBlockCacheHolder() noexcept(false) override {} protected: void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr[iNLumis]); } @@ -212,7 +212,7 @@ namespace edm { RunSummaryCacheHolder() = default; RunSummaryCacheHolder(RunSummaryCacheHolder const&) = delete; RunSummaryCacheHolder& operator=(RunSummaryCacheHolder const&) = delete; - ~RunSummaryCacheHolder() noexcept(false) override{}; + ~RunSummaryCacheHolder() noexcept(false) override {} private: void preallocRunsSummary(unsigned int iNRuns) final { caches_.reset(new std::shared_ptr[iNRuns]); } @@ -252,7 +252,7 @@ namespace edm { LuminosityBlockSummaryCacheHolder() = default; LuminosityBlockSummaryCacheHolder(LuminosityBlockSummaryCacheHolder const&) = delete; LuminosityBlockSummaryCacheHolder& operator=(LuminosityBlockSummaryCacheHolder const&) = delete; - ~LuminosityBlockSummaryCacheHolder() noexcept(false) override{}; + ~LuminosityBlockSummaryCacheHolder() noexcept(false) override {} private: void preallocLumisSummary(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr[iNLumis]); } @@ -309,7 +309,7 @@ namespace edm { BeginProcessBlockProducer() = default; BeginProcessBlockProducer(BeginProcessBlockProducer const&) = delete; BeginProcessBlockProducer& operator=(BeginProcessBlockProducer const&) = delete; - ~BeginProcessBlockProducer() noexcept(false) override{}; + ~BeginProcessBlockProducer() noexcept(false) override {} private: void doBeginProcessBlockProduce_(ProcessBlock&) final; @@ -323,7 +323,7 @@ namespace edm { EndProcessBlockProducer() = default; EndProcessBlockProducer(EndProcessBlockProducer const&) = delete; EndProcessBlockProducer& operator=(EndProcessBlockProducer const&) = delete; - ~EndProcessBlockProducer() noexcept(false) override{}; + ~EndProcessBlockProducer() noexcept(false) override {} private: void doEndProcessBlockProduce_(ProcessBlock&) final; @@ -337,7 +337,7 @@ namespace edm { BeginRunProducer() = default; BeginRunProducer(BeginRunProducer const&) = delete; BeginRunProducer& operator=(BeginRunProducer const&) = delete; - ~BeginRunProducer() noexcept(false) override{}; + ~BeginRunProducer() noexcept(false) override {} private: void doBeginRunProduce_(Run& rp, EventSetup const& c) final; @@ -351,7 +351,7 @@ namespace edm { EndRunProducer() = default; EndRunProducer(EndRunProducer const&) = delete; EndRunProducer& operator=(EndRunProducer const&) = delete; - ~EndRunProducer() noexcept(false) override{}; + ~EndRunProducer() noexcept(false) override {} private: void doEndRunProduce_(Run& rp, EventSetup const& c) final; @@ -365,7 +365,7 @@ namespace edm { EndRunSummaryProducer() = default; EndRunSummaryProducer(EndRunSummaryProducer const&) = delete; EndRunSummaryProducer& operator=(EndRunSummaryProducer const&) = delete; - ~EndRunSummaryProducer() noexcept(false) override{}; + ~EndRunSummaryProducer() noexcept(false) override {} private: void doEndRunProduce_(Run& rp, EventSetup const& c) final { @@ -385,7 +385,7 @@ namespace edm { BeginLuminosityBlockProducer() = default; BeginLuminosityBlockProducer(BeginLuminosityBlockProducer const&) = delete; BeginLuminosityBlockProducer& operator=(BeginLuminosityBlockProducer const&) = delete; - ~BeginLuminosityBlockProducer() noexcept(false) override{}; + ~BeginLuminosityBlockProducer() noexcept(false) override {} private: void doBeginLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final; @@ -398,7 +398,7 @@ namespace edm { EndLuminosityBlockProducer() = default; EndLuminosityBlockProducer(EndLuminosityBlockProducer const&) = delete; EndLuminosityBlockProducer& operator=(EndLuminosityBlockProducer const&) = delete; - ~EndLuminosityBlockProducer() noexcept(false) override{}; + ~EndLuminosityBlockProducer() noexcept(false) override {} private: void doEndLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final; @@ -411,7 +411,7 @@ namespace edm { EndLuminosityBlockSummaryProducer() = default; EndLuminosityBlockSummaryProducer(EndLuminosityBlockSummaryProducer const&) = delete; EndLuminosityBlockSummaryProducer& operator=(EndLuminosityBlockSummaryProducer const&) = delete; - ~EndLuminosityBlockSummaryProducer() noexcept(false) override{}; + ~EndLuminosityBlockSummaryProducer() noexcept(false) override {} private: void doEndLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final { @@ -431,7 +431,7 @@ namespace edm { ExternalWork() = default; ExternalWork(ExternalWork const&) = delete; ExternalWork& operator=(ExternalWork const&) = delete; - ~ExternalWork() noexcept(false) override{}; + ~ExternalWork() noexcept(false) override {} private: bool hasAcquire() const noexcept override { return true; } @@ -447,7 +447,7 @@ namespace edm { Accumulator() = default; Accumulator(Accumulator const&) = delete; Accumulator& operator=(Accumulator const&) = delete; - ~Accumulator() noexcept(false) override{}; + ~Accumulator() noexcept(false) override {} private: bool hasAccumulator() const noexcept override { return true; } @@ -463,7 +463,7 @@ namespace edm { Transformer() = default; Transformer(Transformer const&) = delete; Transformer& operator=(Transformer const&) = delete; - ~Transformer() noexcept(false) override{}; + ~Transformer() noexcept(false) override {} template void registerTransform(ProductRegistryHelper::BranchAliasSetterT iSetter, @@ -531,7 +531,7 @@ namespace edm { } }; } // namespace impl - } // namespace global + } // namespace global } // namespace edm #endif diff --git a/FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h b/FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h index 88cf3e869c861..be70c3e5c317e 100644 --- a/FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h +++ b/FWCore/Framework/interface/global/outputmoduleAbilityToImplementor.h @@ -38,7 +38,7 @@ namespace edm { InputFileWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} InputFileWatcher(InputFileWatcher const&) = delete; InputFileWatcher& operator=(InputFileWatcher const&) = delete; - ~InputFileWatcher() noexcept(false) override{}; + ~InputFileWatcher() noexcept(false) override {} private: void doRespondToOpenInputFile_(FileBlock const&) final; @@ -85,7 +85,7 @@ namespace edm { RunCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} RunCacheHolder(RunCacheHolder const&) = delete; RunCacheHolder& operator=(RunCacheHolder const&) = delete; - ~RunCacheHolder() noexcept(false) override{}; + ~RunCacheHolder() noexcept(false) override {} protected: C const* runCache(edm::RunIndex iID) const { return cache_.get(); } @@ -109,7 +109,7 @@ namespace edm { LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} LuminosityBlockCacheHolder(LuminosityBlockCacheHolder const&) = delete; LuminosityBlockCacheHolder& operator=(LuminosityBlockCacheHolder const&) = delete; - ~LuminosityBlockCacheHolder() noexcept(false) override{}; + ~LuminosityBlockCacheHolder() noexcept(false) override {} protected: void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr[iNLumis]); } @@ -136,7 +136,7 @@ namespace edm { ExternalWork(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} ExternalWork(ExternalWork const&) = delete; ExternalWork& operator=(ExternalWork const&) = delete; - ~ExternalWork() noexcept(false) override{}; + ~ExternalWork() noexcept(false) override {} private: bool hasAcquire() const noexcept override { return true; } @@ -177,7 +177,7 @@ namespace edm { }; } // namespace outputmodule - } // namespace global + } // namespace global } // namespace edm #endif diff --git a/FWCore/Framework/interface/global/producerAbilityToImplementor.h b/FWCore/Framework/interface/global/producerAbilityToImplementor.h index a168902238f27..2eb5ab51ac284 100644 --- a/FWCore/Framework/interface/global/producerAbilityToImplementor.h +++ b/FWCore/Framework/interface/global/producerAbilityToImplementor.h @@ -137,7 +137,7 @@ namespace edm { using Type = edm::global::impl::EmptyType; }; } // namespace producer - } // namespace global + } // namespace global } // namespace edm #endif diff --git a/FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h b/FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h index 08d4f54d612ce..d9f600c057fa0 100644 --- a/FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h +++ b/FWCore/Framework/interface/limited/analyzerAbilityToImplementor.h @@ -67,7 +67,7 @@ namespace edm { using Type = edm::limited::impl::WatchProcessBlock; }; } // namespace analyzer - } // namespace limited + } // namespace limited } // namespace edm #endif diff --git a/FWCore/Framework/interface/limited/filterAbilityToImplementor.h b/FWCore/Framework/interface/limited/filterAbilityToImplementor.h index 7829c69cfb99a..fc9074fcdefa8 100644 --- a/FWCore/Framework/interface/limited/filterAbilityToImplementor.h +++ b/FWCore/Framework/interface/limited/filterAbilityToImplementor.h @@ -127,7 +127,7 @@ namespace edm { using Type = edm::limited::impl::EmptyType; }; } // namespace filter - } // namespace limited + } // namespace limited } // namespace edm #endif diff --git a/FWCore/Framework/interface/limited/implementors.h b/FWCore/Framework/interface/limited/implementors.h index b8c1af22713f2..fd8464f08091d 100644 --- a/FWCore/Framework/interface/limited/implementors.h +++ b/FWCore/Framework/interface/limited/implementors.h @@ -156,7 +156,7 @@ namespace edm { RunCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {} RunCacheHolder(RunCacheHolder const&) = delete; RunCacheHolder& operator=(RunCacheHolder const&) = delete; - ~RunCacheHolder() noexcept(false) override{}; + ~RunCacheHolder() noexcept(false) override {} protected: void preallocRuns(unsigned int iNRuns) final { caches_.reset(new std::shared_ptr[iNRuns]); } @@ -182,7 +182,7 @@ namespace edm { LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {} LuminosityBlockCacheHolder(LuminosityBlockCacheHolder const&) = delete; LuminosityBlockCacheHolder& operator=(LuminosityBlockCacheHolder const&) = delete; - ~LuminosityBlockCacheHolder() noexcept(false) override{}; + ~LuminosityBlockCacheHolder() noexcept(false) override {} protected: C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); } @@ -214,7 +214,7 @@ namespace edm { RunSummaryCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {} RunSummaryCacheHolder(RunSummaryCacheHolder const&) = delete; RunSummaryCacheHolder& operator=(RunSummaryCacheHolder const&) = delete; - ~RunSummaryCacheHolder() noexcept(false) override{}; + ~RunSummaryCacheHolder() noexcept(false) override {} private: void preallocRunsSummary(unsigned int iNRuns) final { caches_.reset(new std::shared_ptr[iNRuns]); } @@ -253,7 +253,7 @@ namespace edm { LuminosityBlockSummaryCacheHolder(edm::ParameterSet const& iPSet) : T(iPSet) {} LuminosityBlockSummaryCacheHolder(LuminosityBlockSummaryCacheHolder const&) = delete; LuminosityBlockSummaryCacheHolder& operator=(LuminosityBlockSummaryCacheHolder const&) = delete; - ~LuminosityBlockSummaryCacheHolder() noexcept(false) override{}; + ~LuminosityBlockSummaryCacheHolder() noexcept(false) override {} private: void preallocLumisSummary(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr[iNLumis]); } @@ -294,7 +294,7 @@ namespace edm { WatchProcessBlock(edm::ParameterSet const& iPSet) : T(iPSet) {} WatchProcessBlock(WatchProcessBlock const&) = delete; WatchProcessBlock& operator=(WatchProcessBlock const&) = delete; - ~WatchProcessBlock() noexcept(false) override{}; + ~WatchProcessBlock() noexcept(false) override {} private: void doBeginProcessBlock_(ProcessBlock const&) final; @@ -310,7 +310,7 @@ namespace edm { BeginProcessBlockProducer(edm::ParameterSet const& iPSet) : T(iPSet) {} BeginProcessBlockProducer(BeginProcessBlockProducer const&) = delete; BeginProcessBlockProducer& operator=(BeginProcessBlockProducer const&) = delete; - ~BeginProcessBlockProducer() noexcept(false) override{}; + ~BeginProcessBlockProducer() noexcept(false) override {} private: void doBeginProcessBlockProduce_(ProcessBlock&) final; @@ -324,7 +324,7 @@ namespace edm { EndProcessBlockProducer(edm::ParameterSet const& iPSet) : T(iPSet) {} EndProcessBlockProducer(EndProcessBlockProducer const&) = delete; EndProcessBlockProducer& operator=(EndProcessBlockProducer const&) = delete; - ~EndProcessBlockProducer() noexcept(false) override{}; + ~EndProcessBlockProducer() noexcept(false) override {} private: void doEndProcessBlockProduce_(ProcessBlock&) final; @@ -338,7 +338,7 @@ namespace edm { BeginRunProducer(edm::ParameterSet const& iPSet) : T(iPSet) {} BeginRunProducer(BeginRunProducer const&) = delete; BeginRunProducer& operator=(BeginRunProducer const&) = delete; - ~BeginRunProducer() noexcept(false) override{}; + ~BeginRunProducer() noexcept(false) override {} private: void doBeginRunProduce_(Run& rp, EventSetup const& c) final; @@ -352,7 +352,7 @@ namespace edm { EndRunProducer(edm::ParameterSet const& iPSet) : T(iPSet) {} EndRunProducer(EndRunProducer const&) = delete; EndRunProducer& operator=(EndRunProducer const&) = delete; - ~EndRunProducer() noexcept(false) override{}; + ~EndRunProducer() noexcept(false) override {} private: void doEndRunProduce_(Run& rp, EventSetup const& c) final; @@ -366,7 +366,7 @@ namespace edm { EndRunSummaryProducer(edm::ParameterSet const& iPSet) : T(iPSet), RunSummaryCacheHolder(iPSet) {} EndRunSummaryProducer(EndRunSummaryProducer const&) = delete; EndRunSummaryProducer& operator=(EndRunSummaryProducer const&) = delete; - ~EndRunSummaryProducer() noexcept(false) override{}; + ~EndRunSummaryProducer() noexcept(false) override {} private: void doEndRunProduce_(Run& rp, EventSetup const& c) final { @@ -386,7 +386,7 @@ namespace edm { BeginLuminosityBlockProducer(edm::ParameterSet const& iPSet) : T(iPSet) {} BeginLuminosityBlockProducer(BeginLuminosityBlockProducer const&) = delete; BeginLuminosityBlockProducer& operator=(BeginLuminosityBlockProducer const&) = delete; - ~BeginLuminosityBlockProducer() noexcept(false) override{}; + ~BeginLuminosityBlockProducer() noexcept(false) override {} private: void doBeginLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final; @@ -399,7 +399,7 @@ namespace edm { EndLuminosityBlockProducer(edm::ParameterSet const& iPSet) : T(iPSet) {} EndLuminosityBlockProducer(EndLuminosityBlockProducer const&) = delete; EndLuminosityBlockProducer& operator=(EndLuminosityBlockProducer const&) = delete; - ~EndLuminosityBlockProducer() noexcept(false) override{}; + ~EndLuminosityBlockProducer() noexcept(false) override {} private: void doEndLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final; @@ -413,7 +413,7 @@ namespace edm { : T(iPSet), LuminosityBlockSummaryCacheHolder(iPSet) {} EndLuminosityBlockSummaryProducer(EndLuminosityBlockSummaryProducer const&) = delete; EndLuminosityBlockSummaryProducer& operator=(EndLuminosityBlockSummaryProducer const&) = delete; - ~EndLuminosityBlockSummaryProducer() noexcept(false) override{}; + ~EndLuminosityBlockSummaryProducer() noexcept(false) override {} private: void doEndLuminosityBlockProduce_(LuminosityBlock& lb, EventSetup const& c) final { @@ -434,7 +434,7 @@ namespace edm { Accumulator() = default; Accumulator(Accumulator const&) = delete; Accumulator& operator=(Accumulator const&) = delete; - ~Accumulator() noexcept(false) override{}; + ~Accumulator() noexcept(false) override {} private: bool hasAccumulator() const noexcept override { return true; } @@ -451,7 +451,7 @@ namespace edm { Transformer() = default; Transformer(Transformer const&) = delete; Transformer& operator=(Transformer const&) = delete; - ~Transformer() noexcept(false) override{}; + ~Transformer() noexcept(false) override {} template void registerTransform(ProductRegistryHelper::BranchAliasSetterT iSetter, @@ -519,7 +519,7 @@ namespace edm { } }; } // namespace impl - } // namespace limited + } // namespace limited } // namespace edm #endif diff --git a/FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h b/FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h index bb6b8ac1cb458..205fdc69c6f88 100644 --- a/FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h +++ b/FWCore/Framework/interface/limited/outputmoduleAbilityToImplementor.h @@ -37,7 +37,7 @@ namespace edm { InputFileWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} InputFileWatcher(InputFileWatcher const&) = delete; InputFileWatcher& operator=(InputFileWatcher const&) = delete; - ~InputFileWatcher() noexcept(false) override{}; + ~InputFileWatcher() noexcept(false) override {} private: void doRespondToOpenInputFile_(FileBlock const&) final; @@ -53,7 +53,7 @@ namespace edm { RunCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} RunCacheHolder(RunCacheHolder const&) = delete; RunCacheHolder& operator=(RunCacheHolder const&) = delete; - ~RunCacheHolder() noexcept(false) override{}; + ~RunCacheHolder() noexcept(false) override {} protected: C const* runCache(edm::RunIndex iID) const { return cache_.get(); } @@ -77,7 +77,7 @@ namespace edm { LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} LuminosityBlockCacheHolder(LuminosityBlockCacheHolder const&) = delete; LuminosityBlockCacheHolder& operator=(LuminosityBlockCacheHolder const&) = delete; - ~LuminosityBlockCacheHolder() noexcept(false) override{}; + ~LuminosityBlockCacheHolder() noexcept(false) override {} protected: C const* luminosityBlockCache(edm::LuminosityBlockIndex iID) const { return caches_[iID].get(); } @@ -117,7 +117,7 @@ namespace edm { }; } // namespace outputmodule - } // namespace limited + } // namespace limited } // namespace edm #endif diff --git a/FWCore/Framework/interface/limited/producerAbilityToImplementor.h b/FWCore/Framework/interface/limited/producerAbilityToImplementor.h index 657f91f534f49..0ed1022e99d14 100644 --- a/FWCore/Framework/interface/limited/producerAbilityToImplementor.h +++ b/FWCore/Framework/interface/limited/producerAbilityToImplementor.h @@ -132,7 +132,7 @@ namespace edm { using Type = edm::limited::impl::EmptyType; }; } // namespace producer - } // namespace limited + } // namespace limited } // namespace edm #endif diff --git a/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h b/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h index f9497511f9fd5..61f3a836721ef 100644 --- a/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h +++ b/FWCore/Framework/interface/one/analyzerAbilityToImplementor.h @@ -69,7 +69,7 @@ namespace edm { using Type = edm::one::impl::WatchProcessBlock; }; } // namespace analyzer - } // namespace one + } // namespace one } // namespace edm #endif diff --git a/FWCore/Framework/interface/one/filterAbilityToImplementor.h b/FWCore/Framework/interface/one/filterAbilityToImplementor.h index c02a44f8a4670..8d9ef222bf988 100644 --- a/FWCore/Framework/interface/one/filterAbilityToImplementor.h +++ b/FWCore/Framework/interface/one/filterAbilityToImplementor.h @@ -105,7 +105,7 @@ namespace edm { }; } // namespace filter - } // namespace one + } // namespace one } // namespace edm #endif diff --git a/FWCore/Framework/interface/one/implementors.h b/FWCore/Framework/interface/one/implementors.h index 604c6216a23c2..503f0682e20b4 100644 --- a/FWCore/Framework/interface/one/implementors.h +++ b/FWCore/Framework/interface/one/implementors.h @@ -92,7 +92,7 @@ namespace edm { RunWatcher() = default; RunWatcher(RunWatcher const&) = delete; RunWatcher& operator=(RunWatcher const&) = delete; - ~RunWatcher() noexcept(false) override{}; + ~RunWatcher() noexcept(false) override {} private: void doBeginRun_(Run const& rp, EventSetup const& c) final; @@ -108,7 +108,7 @@ namespace edm { LuminosityBlockWatcher() = default; LuminosityBlockWatcher(LuminosityBlockWatcher const&) = delete; LuminosityBlockWatcher& operator=(LuminosityBlockWatcher const&) = delete; - ~LuminosityBlockWatcher() noexcept(false) override{}; + ~LuminosityBlockWatcher() noexcept(false) override {} private: void doBeginLuminosityBlock_(LuminosityBlock const& rp, EventSetup const& c) final; @@ -140,7 +140,7 @@ namespace edm { BeginProcessBlockProducer() = default; BeginProcessBlockProducer(BeginProcessBlockProducer const&) = delete; BeginProcessBlockProducer& operator=(BeginProcessBlockProducer const&) = delete; - ~BeginProcessBlockProducer() noexcept(false) override{}; + ~BeginProcessBlockProducer() noexcept(false) override {} private: void doBeginProcessBlockProduce_(ProcessBlock&) final; @@ -154,7 +154,7 @@ namespace edm { EndProcessBlockProducer() = default; EndProcessBlockProducer(EndProcessBlockProducer const&) = delete; EndProcessBlockProducer& operator=(EndProcessBlockProducer const&) = delete; - ~EndProcessBlockProducer() noexcept(false) override{}; + ~EndProcessBlockProducer() noexcept(false) override {} private: void doEndProcessBlockProduce_(ProcessBlock&) final; @@ -168,7 +168,7 @@ namespace edm { BeginRunProducer() = default; BeginRunProducer(BeginRunProducer const&) = delete; BeginRunProducer& operator=(BeginRunProducer const&) = delete; - ~BeginRunProducer() noexcept(false) override{}; + ~BeginRunProducer() noexcept(false) override {} private: void doBeginRunProduce_(Run& rp, EventSetup const& c) final; @@ -182,7 +182,7 @@ namespace edm { EndRunProducer() = default; EndRunProducer(EndRunProducer const&) = delete; EndRunProducer& operator=(EndRunProducer const&) = delete; - ~EndRunProducer() noexcept(false) override{}; + ~EndRunProducer() noexcept(false) override {} private: void doEndRunProduce_(Run& rp, EventSetup const& c) final; @@ -196,7 +196,7 @@ namespace edm { BeginLuminosityBlockProducer() = default; BeginLuminosityBlockProducer(BeginLuminosityBlockProducer const&) = delete; BeginLuminosityBlockProducer& operator=(BeginLuminosityBlockProducer const&) = delete; - ~BeginLuminosityBlockProducer() noexcept(false) override{}; + ~BeginLuminosityBlockProducer() noexcept(false) override {} private: void doBeginLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) final; @@ -210,7 +210,7 @@ namespace edm { EndLuminosityBlockProducer() = default; EndLuminosityBlockProducer(EndLuminosityBlockProducer const&) = delete; EndLuminosityBlockProducer& operator=(EndLuminosityBlockProducer const&) = delete; - ~EndLuminosityBlockProducer() noexcept(false) override{}; + ~EndLuminosityBlockProducer() noexcept(false) override {} private: void doEndLuminosityBlockProduce_(LuminosityBlock& lbp, EventSetup const& c) final; @@ -271,7 +271,7 @@ namespace edm { RunCacheHolder() = default; RunCacheHolder(RunCacheHolder const&) = delete; RunCacheHolder& operator=(RunCacheHolder const&) = delete; - ~RunCacheHolder() noexcept(false) override{}; + ~RunCacheHolder() noexcept(false) override {} protected: void preallocRuns(unsigned int iNRuns) final { caches_.reset(new std::shared_ptr[iNRuns]); } @@ -298,7 +298,7 @@ namespace edm { LuminosityBlockCacheHolder() = default; LuminosityBlockCacheHolder(LuminosityBlockCacheHolder const&) = delete; LuminosityBlockCacheHolder& operator=(LuminosityBlockCacheHolder const&) = delete; - ~LuminosityBlockCacheHolder() noexcept(false) override{}; + ~LuminosityBlockCacheHolder() noexcept(false) override {} protected: void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr[iNLumis]); } @@ -327,7 +327,7 @@ namespace edm { Accumulator() = default; Accumulator(Accumulator const&) = delete; Accumulator& operator=(Accumulator const&) = delete; - ~Accumulator() noexcept(false) override{}; + ~Accumulator() noexcept(false) override {} private: bool hasAccumulator() const noexcept override { return true; } @@ -343,7 +343,7 @@ namespace edm { Transformer() = default; Transformer(Transformer const&) = delete; Transformer& operator=(Transformer const&) = delete; - ~Transformer() noexcept(false) override{}; + ~Transformer() noexcept(false) override {} template void registerTransform(ProductRegistryHelper::BranchAliasSetterT iSetter, @@ -410,7 +410,7 @@ namespace edm { } }; } // namespace impl - } // namespace one + } // namespace one } // namespace edm #endif diff --git a/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h b/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h index 62e4aca078729..f325de174f101 100644 --- a/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h +++ b/FWCore/Framework/interface/one/outputmoduleAbilityToImplementor.h @@ -41,7 +41,7 @@ namespace edm { RunWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} RunWatcher(RunWatcher const&) = delete; RunWatcher& operator=(RunWatcher const&) = delete; - ~RunWatcher() noexcept(false) override{}; + ~RunWatcher() noexcept(false) override {} private: void doBeginRun_(RunForOutput const& r) final; @@ -56,7 +56,7 @@ namespace edm { LuminosityBlockWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} LuminosityBlockWatcher(LuminosityBlockWatcher const&) = delete; LuminosityBlockWatcher& operator=(LuminosityBlockWatcher const&) = delete; - ~LuminosityBlockWatcher() noexcept(false) override{}; + ~LuminosityBlockWatcher() noexcept(false) override {} private: void doBeginLuminosityBlock_(LuminosityBlockForOutput const& lb) final; @@ -71,7 +71,7 @@ namespace edm { InputFileWatcher(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} InputFileWatcher(InputFileWatcher const&) = delete; InputFileWatcher& operator=(InputFileWatcher const&) = delete; - ~InputFileWatcher() noexcept(false) override{}; + ~InputFileWatcher() noexcept(false) override {} private: void doRespondToOpenInputFile_(FileBlock const&) final; @@ -87,7 +87,7 @@ namespace edm { RunCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} RunCacheHolder(RunCacheHolder const&) = delete; RunCacheHolder& operator=(RunCacheHolder const&) = delete; - ~RunCacheHolder() noexcept(false) override{}; + ~RunCacheHolder() noexcept(false) override {} protected: C* runCache(edm::RunIndex iID) { return cache_.get(); } @@ -113,7 +113,7 @@ namespace edm { LuminosityBlockCacheHolder(edm::ParameterSet const& iPSet) : OutputModuleBase(iPSet) {} LuminosityBlockCacheHolder(LuminosityBlockCacheHolder const&) = delete; LuminosityBlockCacheHolder& operator=(LuminosityBlockCacheHolder const&) = delete; - ~LuminosityBlockCacheHolder() noexcept(false) override{}; + ~LuminosityBlockCacheHolder() noexcept(false) override {} protected: void preallocLumis(unsigned int iNLumis) final { caches_.reset(new std::shared_ptr[iNLumis]); } @@ -168,7 +168,7 @@ namespace edm { typedef edm::one::outputmodule::LuminosityBlockCacheHolder Type; }; } // namespace outputmodule - } // namespace one + } // namespace one } // namespace edm #endif diff --git a/FWCore/Framework/interface/one/producerAbilityToImplementor.h b/FWCore/Framework/interface/one/producerAbilityToImplementor.h index 79a1a3a492175..2f002fac6d485 100644 --- a/FWCore/Framework/interface/one/producerAbilityToImplementor.h +++ b/FWCore/Framework/interface/one/producerAbilityToImplementor.h @@ -110,7 +110,7 @@ namespace edm { }; } // namespace producer - } // namespace one + } // namespace one } // namespace edm #endif diff --git a/FWCore/Framework/interface/stream/dummy_helpers.h b/FWCore/Framework/interface/stream/dummy_helpers.h index 01eae53af4c22..a3dac0c2b3eee 100644 --- a/FWCore/Framework/interface/stream/dummy_helpers.h +++ b/FWCore/Framework/interface/stream/dummy_helpers.h @@ -80,7 +80,7 @@ namespace edm { using type = dummy_mutex; }; } // namespace impl - } // namespace stream + } // namespace stream } // namespace edm #endif diff --git a/FWCore/Framework/interface/stream/implementors.h b/FWCore/Framework/interface/stream/implementors.h index f2c93d3d9a487..b6b557e0ff56e 100644 --- a/FWCore/Framework/interface/stream/implementors.h +++ b/FWCore/Framework/interface/stream/implementors.h @@ -286,7 +286,7 @@ namespace edm { ExternalWork() = default; ExternalWork(ExternalWork const&) = delete; ExternalWork& operator=(ExternalWork const&) = delete; - virtual ~ExternalWork() noexcept(false){}; + virtual ~ExternalWork() noexcept(false) {} virtual void acquire(Event const&, edm::EventSetup const&, WaitingTaskWithArenaHolder) = 0; }; @@ -296,7 +296,7 @@ namespace edm { WatchLuminosityBlocks() = default; WatchLuminosityBlocks(WatchLuminosityBlocks const&) = delete; WatchLuminosityBlocks& operator=(WatchLuminosityBlocks const&) = delete; - virtual ~WatchLuminosityBlocks() noexcept(false){}; + virtual ~WatchLuminosityBlocks() noexcept(false) {} // virtual void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) = 0; // virtual void endLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) {} @@ -307,7 +307,7 @@ namespace edm { WatchRuns() = default; WatchRuns(WatchRuns const&) = delete; WatchRuns& operator=(WatchRuns const&) = delete; - virtual ~WatchRuns() noexcept(false){}; + virtual ~WatchRuns() noexcept(false) {} // virtual void beginRun(edm::Run const&, edm::EventSetup const&) = 0; // virtual void endRun(edm::Run const&, edm::EventSetup const&) {} @@ -317,7 +317,7 @@ namespace edm { Transformer() = default; Transformer(Transformer const&) = delete; Transformer& operator=(Transformer const&) = delete; - ~Transformer() noexcept(false) override{}; + ~Transformer() noexcept(false) override {} template void registerTransform(ProducerBase::BranchAliasSetterT iSetter, @@ -390,14 +390,14 @@ namespace edm { Accumulator() = default; Accumulator(Accumulator const&) = delete; Accumulator& operator=(Accumulator const&) = delete; - ~Accumulator() noexcept(false) override{}; + ~Accumulator() noexcept(false) override {} virtual void accumulate(Event const& ev, EventSetup const& es) = 0; void produce(Event& ev, EventSetup const& es) final { accumulate(ev, es); } }; } // namespace impl - } // namespace stream + } // namespace stream } // namespace edm #endif diff --git a/FWCore/Framework/interface/stream/makeGlobal.h b/FWCore/Framework/interface/stream/makeGlobal.h index 579ea45d962f5..1dd05522d1ffb 100644 --- a/FWCore/Framework/interface/stream/makeGlobal.h +++ b/FWCore/Framework/interface/stream/makeGlobal.h @@ -53,6 +53,6 @@ namespace edm { inline dummy_ptr makeInputProcessBlockCacheImpl(void const*) { return dummy_ptr(); } } // namespace impl - } // namespace stream + } // namespace stream } // namespace edm #endif diff --git a/FWCore/Framework/src/EventSetupProvider.cc b/FWCore/Framework/src/EventSetupProvider.cc index 22d7b901b0bef..c4b45655a4c67 100644 --- a/FWCore/Framework/src/EventSetupProvider.cc +++ b/FWCore/Framework/src/EventSetupProvider.cc @@ -502,7 +502,7 @@ namespace edm { } } } // end loop over components used by record - } // end loop over records + } // end loop over records // Loop over candidates for (auto const& candidate : candidateNotRejectedYet) { diff --git a/FWCore/Framework/src/HCTypeTag.cc b/FWCore/Framework/src/HCTypeTag.cc index 10550b46ecac2..a5d316037bc42 100644 --- a/FWCore/Framework/src/HCTypeTag.cc +++ b/FWCore/Framework/src/HCTypeTag.cc @@ -128,7 +128,7 @@ namespace edm { return HCTypeTag(*p.second, p.first); } } // namespace heterocontainer - } // namespace eventsetup + } // namespace eventsetup } // namespace edm #endif diff --git a/FWCore/Framework/src/LuminosityBlockProcessingStatus.h b/FWCore/Framework/src/LuminosityBlockProcessingStatus.h index ff1397f6bcdce..f140423550807 100644 --- a/FWCore/Framework/src/LuminosityBlockProcessingStatus.h +++ b/FWCore/Framework/src/LuminosityBlockProcessingStatus.h @@ -106,7 +106,7 @@ namespace edm { WaitingTaskList endIOVWaitingTasks_; edm::WaitingTaskHolder globalEndRunHolder_; edm::Timestamp endTime_{}; - CMS_THREAD_GUARD(state_) unsigned int nStreamsProcessingLumi_{0}; + CMS_THREAD_GUARD(state_) unsigned int nStreamsProcessingLumi_ { 0 }; std::atomic nStreamsStillProcessingLumi_{0}; enum class State { kRunning, kUpdating, kNoMoreEvents }; std::atomic state_{State::kRunning}; diff --git a/FWCore/Framework/src/MergeableRunProductMetadata.cc b/FWCore/Framework/src/MergeableRunProductMetadata.cc index 910b7547055de..85b16df4fff3e 100644 --- a/FWCore/Framework/src/MergeableRunProductMetadata.cc +++ b/FWCore/Framework/src/MergeableRunProductMetadata.cc @@ -113,7 +113,7 @@ namespace edm { } ++processIndex; } // end of loop over processes - } // end of readRun function + } // end of readRun function void MergeableRunProductMetadata::writeLumi(LuminosityBlockNumber_t lumi) { if (metadataForProcesses_.empty()) { diff --git a/FWCore/Framework/src/global/analyzerImplementors.cc b/FWCore/Framework/src/global/analyzerImplementors.cc index b48e076fc2e73..82918fc489b75 100644 --- a/FWCore/Framework/src/global/analyzerImplementors.cc +++ b/FWCore/Framework/src/global/analyzerImplementors.cc @@ -14,5 +14,5 @@ namespace edm { namespace impl { template class WatchProcessBlock; } // namespace impl - } // namespace global + } // namespace global } // namespace edm diff --git a/FWCore/Framework/src/global/filterImplementors.cc b/FWCore/Framework/src/global/filterImplementors.cc index 2096ca080a04d..7fde307c592ec 100644 --- a/FWCore/Framework/src/global/filterImplementors.cc +++ b/FWCore/Framework/src/global/filterImplementors.cc @@ -28,5 +28,5 @@ namespace edm { template class EndLuminosityBlockProducer; template class ExternalWork; } // namespace impl - } // namespace global + } // namespace global } // namespace edm diff --git a/FWCore/Framework/src/global/implementorsMethods.h b/FWCore/Framework/src/global/implementorsMethods.h index e4b0828a9f164..6b31ce835f018 100644 --- a/FWCore/Framework/src/global/implementorsMethods.h +++ b/FWCore/Framework/src/global/implementorsMethods.h @@ -78,7 +78,7 @@ namespace edm { this->acquire(s, ev, es, holder); } } // namespace impl - } // namespace global + } // namespace global } // namespace edm #endif diff --git a/FWCore/Framework/src/global/outputmoduleImplementors.cc b/FWCore/Framework/src/global/outputmoduleImplementors.cc index e06fb4afadc54..37e323ba6a1d1 100644 --- a/FWCore/Framework/src/global/outputmoduleImplementors.cc +++ b/FWCore/Framework/src/global/outputmoduleImplementors.cc @@ -23,5 +23,5 @@ namespace edm { void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB) { respondToOpenInputFile(iB); } void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB) { respondToCloseInputFile(iB); } } // namespace outputmodule - } // namespace global + } // namespace global } // namespace edm diff --git a/FWCore/Framework/src/global/producerImplementors.cc b/FWCore/Framework/src/global/producerImplementors.cc index 577355b35192e..fb5e8cb253091 100644 --- a/FWCore/Framework/src/global/producerImplementors.cc +++ b/FWCore/Framework/src/global/producerImplementors.cc @@ -28,5 +28,5 @@ namespace edm { template class EndLuminosityBlockProducer; template class ExternalWork; } // namespace impl - } // namespace global + } // namespace global } // namespace edm diff --git a/FWCore/Framework/src/limited/analyzerImplementors.cc b/FWCore/Framework/src/limited/analyzerImplementors.cc index 9fb322c915591..bffaee01f4cc9 100644 --- a/FWCore/Framework/src/limited/analyzerImplementors.cc +++ b/FWCore/Framework/src/limited/analyzerImplementors.cc @@ -14,5 +14,5 @@ namespace edm { namespace impl { template class WatchProcessBlock; } // namespace impl - } // namespace limited + } // namespace limited } // namespace edm diff --git a/FWCore/Framework/src/limited/filterImplementors.cc b/FWCore/Framework/src/limited/filterImplementors.cc index 37cb6548f3859..6482da6c33045 100644 --- a/FWCore/Framework/src/limited/filterImplementors.cc +++ b/FWCore/Framework/src/limited/filterImplementors.cc @@ -27,5 +27,5 @@ namespace edm { template class BeginLuminosityBlockProducer; template class EndLuminosityBlockProducer; } // namespace impl - } // namespace limited + } // namespace limited } // namespace edm diff --git a/FWCore/Framework/src/limited/implementorsMethods.h b/FWCore/Framework/src/limited/implementorsMethods.h index f6012ef446ca3..1a1c85944e783 100644 --- a/FWCore/Framework/src/limited/implementorsMethods.h +++ b/FWCore/Framework/src/limited/implementorsMethods.h @@ -68,7 +68,7 @@ namespace edm { this->globalEndLuminosityBlockProduce(rp, c); } } // namespace impl - } // namespace limited + } // namespace limited } // namespace edm #endif diff --git a/FWCore/Framework/src/limited/outputmoduleImplementors.cc b/FWCore/Framework/src/limited/outputmoduleImplementors.cc index 425d69eca980d..9fe349ccf4559 100644 --- a/FWCore/Framework/src/limited/outputmoduleImplementors.cc +++ b/FWCore/Framework/src/limited/outputmoduleImplementors.cc @@ -23,5 +23,5 @@ namespace edm { void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB) { respondToOpenInputFile(iB); } void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB) { respondToCloseInputFile(iB); } } // namespace outputmodule - } // namespace limited + } // namespace limited } // namespace edm diff --git a/FWCore/Framework/src/limited/producerImplementors.cc b/FWCore/Framework/src/limited/producerImplementors.cc index 09cae7679752b..450418e26c9b3 100644 --- a/FWCore/Framework/src/limited/producerImplementors.cc +++ b/FWCore/Framework/src/limited/producerImplementors.cc @@ -27,5 +27,5 @@ namespace edm { template class BeginLuminosityBlockProducer; template class EndLuminosityBlockProducer; } // namespace impl - } // namespace limited + } // namespace limited } // namespace edm diff --git a/FWCore/Framework/src/one/analyzerImplementors.cc b/FWCore/Framework/src/one/analyzerImplementors.cc index a4ffacc89b859..ee0966cf3e18c 100644 --- a/FWCore/Framework/src/one/analyzerImplementors.cc +++ b/FWCore/Framework/src/one/analyzerImplementors.cc @@ -24,5 +24,5 @@ namespace edm { template class LuminosityBlockWatcher; template class WatchProcessBlock; } // namespace impl - } // namespace one + } // namespace one } // namespace edm diff --git a/FWCore/Framework/src/one/filterImplementors.cc b/FWCore/Framework/src/one/filterImplementors.cc index 14bead72081e7..cfa2cc1a44ca3 100644 --- a/FWCore/Framework/src/one/filterImplementors.cc +++ b/FWCore/Framework/src/one/filterImplementors.cc @@ -30,5 +30,5 @@ namespace edm { template class BeginLuminosityBlockProducer; template class EndLuminosityBlockProducer; } // namespace impl - } // namespace one + } // namespace one } // namespace edm diff --git a/FWCore/Framework/src/one/implementorsMethods.h b/FWCore/Framework/src/one/implementorsMethods.h index 589310216f275..5860b44d3c138 100644 --- a/FWCore/Framework/src/one/implementorsMethods.h +++ b/FWCore/Framework/src/one/implementorsMethods.h @@ -100,7 +100,7 @@ namespace edm { this->endLuminosityBlockProduce(rp, c); } } // namespace impl - } // namespace one + } // namespace one } // namespace edm #endif diff --git a/FWCore/Framework/src/one/outputmoduleImplementors.cc b/FWCore/Framework/src/one/outputmoduleImplementors.cc index 577a6cd43fdb4..a9530a7725f41 100644 --- a/FWCore/Framework/src/one/outputmoduleImplementors.cc +++ b/FWCore/Framework/src/one/outputmoduleImplementors.cc @@ -35,5 +35,5 @@ namespace edm { void InputFileWatcher::doRespondToOpenInputFile_(FileBlock const& iB) { respondToOpenInputFile(iB); } void InputFileWatcher::doRespondToCloseInputFile_(FileBlock const& iB) { respondToCloseInputFile(iB); } } // namespace outputmodule - } // namespace one + } // namespace one } // namespace edm diff --git a/FWCore/Framework/src/one/producerImplementors.cc b/FWCore/Framework/src/one/producerImplementors.cc index 94d481a041efc..92aa0e7e97e22 100644 --- a/FWCore/Framework/src/one/producerImplementors.cc +++ b/FWCore/Framework/src/one/producerImplementors.cc @@ -30,5 +30,5 @@ namespace edm { template class BeginLuminosityBlockProducer; template class EndLuminosityBlockProducer; } // namespace impl - } // namespace one + } // namespace one } // namespace edm diff --git a/FWCore/Integration/plugins/DelayedReaderThrowingSource.cc b/FWCore/Integration/plugins/DelayedReaderThrowingSource.cc index e635d2a21a086..23e0a91ec7c5f 100644 --- a/FWCore/Integration/plugins/DelayedReaderThrowingSource.cc +++ b/FWCore/Integration/plugins/DelayedReaderThrowingSource.cc @@ -46,8 +46,8 @@ namespace edm { throw copyException; } } - void mergeReaders_(DelayedReader*) final{}; - void reset_() final{}; + void mergeReaders_(DelayedReader*) final {} + void reset_() final {} signalslot::Signal const* preEventReadFromSourceSignal_ = nullptr; diff --git a/FWCore/Integration/plugins/TestInterProcessProd.cc b/FWCore/Integration/plugins/TestInterProcessProd.cc index 3c9b7fcde5b1f..9c0c99ce96751 100644 --- a/FWCore/Integration/plugins/TestInterProcessProd.cc +++ b/FWCore/Integration/plugins/TestInterProcessProd.cc @@ -51,8 +51,9 @@ namespace testinter { } template - auto doTransition(SERIAL& iDeserializer, edm::Transition iTrans, unsigned long long iTransitionID) - -> decltype(iDeserializer.deserialize()) { + auto doTransition(SERIAL& iDeserializer, + edm::Transition iTrans, + unsigned long long iTransitionID) -> decltype(iDeserializer.deserialize()) { decltype(iDeserializer.deserialize()) value; if (not channel_.doTransition( [&value, this]() { diff --git a/FWCore/Integration/plugins/TestInterProcessRandomProd.cc b/FWCore/Integration/plugins/TestInterProcessRandomProd.cc index 3da47e4657753..1c40b570cdc53 100644 --- a/FWCore/Integration/plugins/TestInterProcessRandomProd.cc +++ b/FWCore/Integration/plugins/TestInterProcessRandomProd.cc @@ -63,8 +63,9 @@ namespace testinter { } template - auto doTransition(SERIAL& iDeserializer, edm::Transition iTrans, unsigned long long iTransitionID) - -> decltype(iDeserializer.deserialize()) { + auto doTransition(SERIAL& iDeserializer, + edm::Transition iTrans, + unsigned long long iTransitionID) -> decltype(iDeserializer.deserialize()) { decltype(iDeserializer.deserialize()) value; if (not channel_.doTransition( [&value, this]() { diff --git a/FWCore/MessageLogger/interface/ELseverityLevel.h b/FWCore/MessageLogger/interface/ELseverityLevel.h index cfd2fd7935137..00092bdc7aaf6 100644 --- a/FWCore/MessageLogger/interface/ELseverityLevel.h +++ b/FWCore/MessageLogger/interface/ELseverityLevel.h @@ -41,7 +41,7 @@ namespace edm { ELsev_highestSeverity, // threshold use only // ----- nLevels // how many levels? - }; // ELsev_ + }; // ELsev_ // ----- Birth/death: // diff --git a/FWCore/MessageLogger/interface/MessageLoggerQ.h b/FWCore/MessageLogger/interface/MessageLoggerQ.h index c43f1af218cfc..f6faf02511e0c 100644 --- a/FWCore/MessageLogger/interface/MessageLoggerQ.h +++ b/FWCore/MessageLogger/interface/MessageLoggerQ.h @@ -47,7 +47,7 @@ namespace edm { GROUP_STATS // GRP , FJR_SUMMARY // JRS -- handshaked - }; // OpCode + }; // OpCode // --- birth via a surrogate: static MessageLoggerQ* instance(); diff --git a/FWCore/MessageService/src/ELoutput.cc b/FWCore/MessageService/src/ELoutput.cc index 714cf2b3ddf5d..95cf483776c60 100644 --- a/FWCore/MessageService/src/ELoutput.cc +++ b/FWCore/MessageService/src/ELoutput.cc @@ -113,7 +113,7 @@ namespace { #endif return std::string(ts); // Change log 7 - } // formatTime() + } // formatTime() } // namespace using namespace edm::messagelogger; diff --git a/FWCore/MessageService/src/ELstatistics.cc b/FWCore/MessageService/src/ELstatistics.cc index 1bb932eb830f1..6672c85b1d89d 100644 --- a/FWCore/MessageService/src/ELstatistics.cc +++ b/FWCore/MessageService/src/ELstatistics.cc @@ -299,7 +299,7 @@ namespace edm { p3[lev].n += groupTotal; p3[lev].t += groupAggregateN; } // end if groupTotal>0 - } // for g + } // for g // ----- Provide footnote to part I, if needed: // @@ -440,7 +440,7 @@ namespace edm { p3[lev].n += groupTotal; p3[lev].t += groupAggregateN; } // end if groupTotal>0 - } // for g + } // for g // part II (sample event numbers) does not exist for the job report. diff --git a/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc b/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc index 68bd907470c12..a016bf2f91de6 100644 --- a/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc +++ b/FWCore/MessageService/src/ThreadSafeLogMessageLoggerScribe.cc @@ -497,7 +497,7 @@ namespace edm { if (dest_default_limit < 0) dest_default_limit = 2000000000; dest_ctrl->setLimit("*", dest_default_limit); - } // change log 1b, 2a, 2b + } // change log 1b, 2a, 2b if (dest_default_interval != defaults.NO_VALUE_SET) { // change log 6 dest_ctrl->setInterval("*", dest_default_interval); } diff --git a/FWCore/SOA/interface/tablehelpers.h b/FWCore/SOA/interface/tablehelpers.h index 3e068847e2ac3..e742de8336e9b 100644 --- a/FWCore/SOA/interface/tablehelpers.h +++ b/FWCore/SOA/interface/tablehelpers.h @@ -42,7 +42,7 @@ namespace edm { }; } // namespace impl - } // namespace soa + } // namespace soa } // namespace edm #endif diff --git a/FWCore/Services/plugins/UnixSignalService.cc b/FWCore/Services/plugins/UnixSignalService.cc index 41f2ad337a1c8..48b003259ab63 100644 --- a/FWCore/Services/plugins/UnixSignalService.cc +++ b/FWCore/Services/plugins/UnixSignalService.cc @@ -29,7 +29,7 @@ namespace edm { private: bool enableSigInt_; }; // class UnixSignalService - } // end of namespace service + } // end of namespace service } // end of namespace edm namespace edm { diff --git a/FWCore/Utilities/interface/ReusableObjectHolder.h b/FWCore/Utilities/interface/ReusableObjectHolder.h index bb53e407cc46c..15d3e89f3d007 100644 --- a/FWCore/Utilities/interface/ReusableObjectHolder.h +++ b/FWCore/Utilities/interface/ReusableObjectHolder.h @@ -143,9 +143,8 @@ namespace edm { std::shared_ptr wrapCustomDeleter(std::unique_ptr item) { auto deleter = item.get_deleter(); ++m_outstandingObjects; - return std::shared_ptr{item.release(), [this, deleter](T* iItem) { - this->addBack(std::unique_ptr{iItem, deleter}); - }}; + return std::shared_ptr{ + item.release(), [this, deleter](T* iItem) { this->addBack(std::unique_ptr{iItem, deleter}); }}; } std::unique_ptr makeUnique(T* ptr) { diff --git a/FWCore/Utilities/interface/VecArray.h b/FWCore/Utilities/interface/VecArray.h index a7e055e3ef4d0..282c9dda880f1 100644 --- a/FWCore/Utilities/interface/VecArray.h +++ b/FWCore/Utilities/interface/VecArray.h @@ -113,8 +113,8 @@ namespace edm { size_ = size; } - void swap(VecArray& other) noexcept(noexcept(std::swap(data_, other.data_)) && noexcept(std::swap(size_, - other.size_))) { + void swap(VecArray& other) noexcept(noexcept(std::swap(data_, other.data_)) && + noexcept(std::swap(size_, other.size_))) { std::swap(data_, other.data_); std::swap(size_, other.size_); } diff --git a/FWCore/Utilities/interface/transform.h b/FWCore/Utilities/interface/transform.h index f7b4e3e07af60..3271024ae373c 100644 --- a/FWCore/Utilities/interface/transform.h +++ b/FWCore/Utilities/interface/transform.h @@ -8,8 +8,9 @@ namespace edm { // helper template function to build a vector applying a transformation to the elements of an input vector template - auto vector_transform(std::vector const& input, Function predicate) -> std::vector< - typename std::remove_cv::type>::type> { + auto vector_transform(std::vector const& input, Function predicate) + -> std::vector< + typename std::remove_cv::type>::type> { using ReturnType = typename std::remove_cv::type>::type; std::vector output; diff --git a/FWCore/Utilities/src/EDMException.cc b/FWCore/Utilities/src/EDMException.cc index 3d5c9ba6c478b..c3b8539e9f499 100644 --- a/FWCore/Utilities/src/EDMException.cc +++ b/FWCore/Utilities/src/EDMException.cc @@ -1,8 +1,7 @@ #include "FWCore/Utilities/interface/EDMException.h" -#define FILLENTRY(name) \ - { name, #name } +#define FILLENTRY(name) {name, #name} namespace edm { namespace errors { diff --git a/FWCore/Utilities/test/reusableobjectholder_t.cppunit.cpp b/FWCore/Utilities/test/reusableobjectholder_t.cppunit.cpp index 946ac3ed70b83..ad959940a4caf 100644 --- a/FWCore/Utilities/test/reusableobjectholder_t.cppunit.cpp +++ b/FWCore/Utilities/test/reusableobjectholder_t.cppunit.cpp @@ -180,28 +180,24 @@ void reusableobjectholder_test::testDeletion() { CPPUNIT_ASSERT(*p == 2); { - auto p3 = intHolder.makeOrGet([]() { - return std::unique_ptr{new int{3}, CustomDeleter{3}}; - }); + auto p3 = + intHolder.makeOrGet([]() { return std::unique_ptr{new int{3}, CustomDeleter{3}}; }); CPPUNIT_ASSERT(p.get() != nullptr); CPPUNIT_ASSERT(*p3 == 3); - auto p4 = intHolder.makeOrGet([]() { - return std::unique_ptr{new int{4}, CustomDeleter{4}}; - }); + auto p4 = + intHolder.makeOrGet([]() { return std::unique_ptr{new int{4}, CustomDeleter{4}}; }); CPPUNIT_ASSERT(p.get() != nullptr); CPPUNIT_ASSERT(*p4 == 4); } - auto p34 = intHolder.makeOrGet([]() { - return std::unique_ptr{new int{3}, CustomDeleter{3}}; - }); + auto p34 = + intHolder.makeOrGet([]() { return std::unique_ptr{new int{3}, CustomDeleter{3}}; }); CPPUNIT_ASSERT(p.get() != nullptr); CPPUNIT_ASSERT(*p34 == 3 or *p34 == 4); - auto p43 = intHolder.makeOrGet([]() { - return std::unique_ptr{new int{4}, CustomDeleter{4}}; - }); + auto p43 = + intHolder.makeOrGet([]() { return std::unique_ptr{new int{4}, CustomDeleter{4}}; }); CPPUNIT_ASSERT(p.get() != nullptr); CPPUNIT_ASSERT(*p43 == 3 or *p43 == 4); CPPUNIT_ASSERT(*p34 != *p43); diff --git a/IOMC/RandomEngine/plugins/RandomNumberGeneratorService.cc b/IOMC/RandomEngine/plugins/RandomNumberGeneratorService.cc index ae77696a8d98b..964a4b5e2f11e 100644 --- a/IOMC/RandomEngine/plugins/RandomNumberGeneratorService.cc +++ b/IOMC/RandomEngine/plugins/RandomNumberGeneratorService.cc @@ -1131,7 +1131,7 @@ namespace edm { } moduleIDVector.emplace_back(&engines.back(), moduleID); } // if moduleID valid - } // loop over seedsAndMap + } // loop over seedsAndMap std::sort(moduleIDVector.begin(), moduleIDVector.end()); } diff --git a/IOPool/Input/src/RootTree.cc b/IOPool/Input/src/RootTree.cc index 876f39b7fb864..d1fd1cb7610e5 100644 --- a/IOPool/Input/src/RootTree.cc +++ b/IOPool/Input/src/RootTree.cc @@ -135,7 +135,7 @@ namespace edm { return true; // backward compatibility return (entries_ == metaTree_->GetEntries() && tree_->GetNbranches() <= metaTree_->GetNbranches() + 1); // backward compatibility - } // backward compatibility + } // backward compatibility return false; } diff --git a/IOPool/Output/interface/TimeoutPoolOutputModule.h b/IOPool/Output/interface/TimeoutPoolOutputModule.h index c21d6258825f2..d716e3347d48c 100644 --- a/IOPool/Output/interface/TimeoutPoolOutputModule.h +++ b/IOPool/Output/interface/TimeoutPoolOutputModule.h @@ -23,7 +23,7 @@ namespace edm { class TimeoutPoolOutputModule : public PoolOutputModule { public: explicit TimeoutPoolOutputModule(ParameterSet const& ps); - ~TimeoutPoolOutputModule() override{}; + ~TimeoutPoolOutputModule() override {} TimeoutPoolOutputModule(TimeoutPoolOutputModule const&) = delete; // Disallow copying and moving TimeoutPoolOutputModule& operator=(TimeoutPoolOutputModule const&) = delete; // Disallow copying and moving diff --git a/IOPool/Streamer/interface/StreamerOutputModuleBase.h b/IOPool/Streamer/interface/StreamerOutputModuleBase.h index eedade18f4ac0..cc69cb35221fe 100644 --- a/IOPool/Streamer/interface/StreamerOutputModuleBase.h +++ b/IOPool/Streamer/interface/StreamerOutputModuleBase.h @@ -48,7 +48,7 @@ namespace edm { bool lastCallWasBeginRun_ = false; }; //end-of-class-def - } // namespace streamer + } // namespace streamer } // namespace edm #endif diff --git a/IOPool/Streamer/interface/StreamerOutputModuleCommon.h b/IOPool/Streamer/interface/StreamerOutputModuleCommon.h index 7c6a2fbb830b5..6b668c2259c43 100644 --- a/IOPool/Streamer/interface/StreamerOutputModuleCommon.h +++ b/IOPool/Streamer/interface/StreamerOutputModuleCommon.h @@ -59,7 +59,7 @@ namespace edm { uint32_t eventMetaDataChecksum_ = 0; }; //end-of-class-def - } // namespace streamer + } // namespace streamer } // namespace edm #endif diff --git a/IOPool/Streamer/interface/StreamerOutputMsgBuilders.h b/IOPool/Streamer/interface/StreamerOutputMsgBuilders.h index caed77c0c4a9a..6e6f418f6650b 100644 --- a/IOPool/Streamer/interface/StreamerOutputMsgBuilders.h +++ b/IOPool/Streamer/interface/StreamerOutputMsgBuilders.h @@ -87,7 +87,7 @@ namespace edm { uint32_t eventMetaDataChecksum_ = 0; }; //end-of-class-def - } // namespace streamer + } // namespace streamer } // namespace edm #endif diff --git a/IOPool/Streamer/src/StreamerFileWriter.h b/IOPool/Streamer/src/StreamerFileWriter.h index e8213fe0fab12..d3807b4b74f6a 100644 --- a/IOPool/Streamer/src/StreamerFileWriter.h +++ b/IOPool/Streamer/src/StreamerFileWriter.h @@ -34,7 +34,7 @@ namespace edm { void doOutputEvent(EventMsgView const& msg); void start() {} - void stop(){}; + void stop() {} uint32 get_adler32() const { return stream_writer_->adler32(); } diff --git a/IOPool/TFileAdaptor/src/ReadRepacker.h b/IOPool/TFileAdaptor/src/ReadRepacker.h index 5422d00a8db0b..e23043947a239 100644 --- a/IOPool/TFileAdaptor/src/ReadRepacker.h +++ b/IOPool/TFileAdaptor/src/ReadRepacker.h @@ -50,7 +50,7 @@ class ReadRepacker { IOSize extraBytes() const { return m_extra_bytes; } // Returns the number of extra bytes to be issued to the I/O system - // Note that (buffer_used - extra_bytes) should equal the number of "real" bytes serviced. + // Note that (buffer_used - extra_bytes) should equal the number of "real" bytes serviced. IOSize realBytesProcessed() const { return m_buffer_used - m_extra_bytes; } // Return the number of bytes of the input request that would be processed by the IO vector diff --git a/PerfTools/AllocMonitor/test/test_catch2_AllocMonitorRegistry.cc b/PerfTools/AllocMonitor/test/test_catch2_AllocMonitorRegistry.cc index ea7e322b298da..97824151a82d5 100644 --- a/PerfTools/AllocMonitor/test/test_catch2_AllocMonitorRegistry.cc +++ b/PerfTools/AllocMonitor/test/test_catch2_AllocMonitorRegistry.cc @@ -7,13 +7,11 @@ namespace cms::perftools { class AllocTester { public: void callAlloc(size_t iRequested, size_t iActual) { - reg_.allocCalled( - iRequested, []() { return nullptr; }, [iActual](auto) { return iActual; }); + reg_.allocCalled(iRequested, []() { return nullptr; }, [iActual](auto) { return iActual; }); } void callDealloc(size_t iActual) { - reg_.deallocCalled( - reinterpret_cast(1), [](auto) {}, [iActual](auto) { return iActual; }); + reg_.deallocCalled(reinterpret_cast(1), [](auto) {}, [iActual](auto) { return iActual; }); } template @@ -27,8 +25,7 @@ namespace cms::perftools { } void callDeallocNull() { - reg_.deallocCalled( - nullptr, [](auto) {}, [](auto) { return 0; }); + reg_.deallocCalled(nullptr, [](auto) {}, [](auto) { return 0; }); } AllocMonitorRegistry reg_; diff --git a/PerfTools/AllocMonitorPreload/src/memory_proxies.cc b/PerfTools/AllocMonitorPreload/src/memory_proxies.cc index 25e857b75d5cd..fc5c93fa2dbac 100644 --- a/PerfTools/AllocMonitorPreload/src/memory_proxies.cc +++ b/PerfTools/AllocMonitorPreload/src/memory_proxies.cc @@ -199,8 +199,7 @@ void* malloc(size_t size) noexcept { return original(size); } auto& reg = AllocMonitorRegistry::instance(); - return reg.allocCalled( - size, [size]() { return original(size); }, [](auto ret) { return malloc_usable_size(ret); }); + return reg.allocCalled(size, [size]() { return original(size); }, [](auto ret) { return malloc_usable_size(ret); }); } void* calloc(size_t nitems, size_t item_size) noexcept { @@ -231,10 +230,8 @@ void* realloc(void* ptr, size_t size) noexcept { } size_t used = malloc_usable_size(ret); if (used != oldsize) { - reg.deallocCalled( - ptr, [](auto) {}, [oldsize](auto) { return oldsize; }); - reg.allocCalled( - size, []() { return nullptr; }, [used](auto) { return used; }); + reg.deallocCalled(ptr, [](auto) {}, [oldsize](auto) { return oldsize; }); + reg.allocCalled(size, []() { return nullptr; }, [used](auto) { return used; }); } return ret; } @@ -295,8 +292,7 @@ void free(void* ptr) noexcept { } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [](auto ptr) { original(ptr); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [](auto ptr) { original(ptr); }, [](auto ptr) { return malloc_usable_size(ptr); }); } } } // extern "C" @@ -316,8 +312,7 @@ void* operator new(std::size_t size) { } auto& reg = AllocMonitorRegistry::instance(); - return reg.allocCalled( - size, [size]() { return original(size); }, [](auto ret) { return malloc_usable_size(ret); }); + return reg.allocCalled(size, [size]() { return original(size); }, [](auto ret) { return malloc_usable_size(ret); }); } //_Znwm void operator delete(void* ptr) noexcept { @@ -328,8 +323,7 @@ void operator delete(void* ptr) noexcept { } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [](auto ptr) { original(ptr); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [](auto ptr) { original(ptr); }, [](auto ptr) { return malloc_usable_size(ptr); }); } //_ZdlPv void* operator new[](std::size_t size) { @@ -339,8 +333,7 @@ void* operator new[](std::size_t size) { } auto& reg = AllocMonitorRegistry::instance(); - return reg.allocCalled( - size, [size]() { return original(size); }, [](auto ret) { return malloc_usable_size(ret); }); + return reg.allocCalled(size, [size]() { return original(size); }, [](auto ret) { return malloc_usable_size(ret); }); } //_Znam void operator delete[](void* ptr) noexcept { @@ -351,8 +344,7 @@ void operator delete[](void* ptr) noexcept { return; } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [](auto ptr) { original(ptr); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [](auto ptr) { original(ptr); }, [](auto ptr) { return malloc_usable_size(ptr); }); } //_ZdaPv void* operator new(std::size_t size, std::align_val_t al) { @@ -440,8 +432,7 @@ void operator delete(void* ptr, std::align_val_t al) noexcept { return; } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [al](auto ptr) { original(ptr, al); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [al](auto ptr) { original(ptr, al); }, [](auto ptr) { return malloc_usable_size(ptr); }); } //_ZdlPvSt11align_val_t void operator delete[](void* ptr, std::align_val_t al) noexcept { @@ -452,8 +443,7 @@ void operator delete[](void* ptr, std::align_val_t al) noexcept { return; } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [al](auto ptr) { original(ptr, al); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [al](auto ptr) { original(ptr, al); }, [](auto ptr) { return malloc_usable_size(ptr); }); } //_ZdaPvSt11align_val_t void operator delete(void* ptr, std::size_t sz) noexcept { @@ -464,8 +454,7 @@ void operator delete(void* ptr, std::size_t sz) noexcept { return; } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [sz](auto ptr) { original(ptr, sz); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [sz](auto ptr) { original(ptr, sz); }, [](auto ptr) { return malloc_usable_size(ptr); }); } //_ZdlPvm void operator delete[](void* ptr, std::size_t sz) noexcept { @@ -476,8 +465,7 @@ void operator delete[](void* ptr, std::size_t sz) noexcept { return; } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [sz](auto ptr) { original(ptr, sz); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [sz](auto ptr) { original(ptr, sz); }, [](auto ptr) { return malloc_usable_size(ptr); }); } //_ZdaPvm void operator delete(void* ptr, std::size_t sz, std::align_val_t al) noexcept { @@ -515,8 +503,7 @@ void operator delete(void* ptr, const std::nothrow_t& tag) noexcept { return; } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [&tag](auto ptr) { original(ptr, tag); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [&tag](auto ptr) { original(ptr, tag); }, [](auto ptr) { return malloc_usable_size(ptr); }); } //_ZdlPvRKSt9nothrow_t void operator delete[](void* ptr, const std::nothrow_t& tag) noexcept { @@ -528,8 +515,7 @@ void operator delete[](void* ptr, const std::nothrow_t& tag) noexcept { return; } auto& reg = AllocMonitorRegistry::instance(); - reg.deallocCalled( - ptr, [&tag](auto ptr) { original(ptr, tag); }, [](auto ptr) { return malloc_usable_size(ptr); }); + reg.deallocCalled(ptr, [&tag](auto ptr) { original(ptr, tag); }, [](auto ptr) { return malloc_usable_size(ptr); }); } //_ZdaPvRKSt9nothrow_t void operator delete(void* ptr, std::align_val_t al, const std::nothrow_t& tag) noexcept { diff --git a/Utilities/XrdAdaptor/src/XrdRequestManager.h b/Utilities/XrdAdaptor/src/XrdRequestManager.h index 07b7b16c2da57..397c33b6fb94a 100644 --- a/Utilities/XrdAdaptor/src/XrdRequestManager.h +++ b/Utilities/XrdAdaptor/src/XrdRequestManager.h @@ -33,7 +33,7 @@ namespace XrdAdaptor { XrootdException(XrdCl::Status &xrootd_status, edm::Exception::Code code) : Exception(code), m_code(xrootd_status.code) {} - ~XrootdException() noexcept override{}; + ~XrootdException() noexcept override {} uint16_t getCode() { return m_code; }