From 681d6fdafcd164be0480ba8039a5235285a189b5 Mon Sep 17 00:00:00 2001 From: scott snyder <snyder@bnl.gov> Date: Sun, 18 Jun 2017 16:04:05 +0200 Subject: [PATCH] MuonPRDTest: Fix compilation warnings. In c++11, exceptions cannot be propagated from destructors. Call terminate() rather than using throw. Former-commit-id: 4b5559ed46df1a061a3b84f783ce0fd83a21c7d1 --- .../MuonValidation/MuonPRDTest/src/CSCDigitVariables.h | 2 +- .../MuonValidation/MuonPRDTest/src/MMDigitVariables.h | 2 +- .../MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h | 2 +- .../MuonValidation/MuonPRDTest/src/MMSimHitVariables.h | 2 +- .../MuonValidation/MuonPRDTest/src/MuEntryVariables.h | 2 +- .../MuonValidation/MuonPRDTest/src/TruthVariables.h | 2 +- .../MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h | 2 +- .../MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h | 2 +- .../MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h index 6191c663407..36c9a2e8484 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/CSCDigitVariables.h @@ -43,7 +43,7 @@ class CSCDigitVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete CSCDigitVariables."); - throw; + std::terminate(); } } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h index dd2cf05fe1c..a17cf294e6d 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMDigitVariables.h @@ -64,7 +64,7 @@ class MMDigitVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete MMDigitVariables."); - throw; + std::terminate(); } } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h index 1f43aef79ff..d978b62bd38 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMFastDigitVariables.h @@ -44,7 +44,7 @@ class MMFastDigitVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete MMFastDigitVariables."); - throw; + std::terminate(); } } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h index e0f323d9897..bed164413de 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MMSimHitVariables.h @@ -72,7 +72,7 @@ class MMSimHitVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete MMSimHitVariables."); - throw; + std::terminate(); } } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h index 3bb6f6534d2..b4226cdcbf5 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/MuEntryVariables.h @@ -37,7 +37,7 @@ class MuEntryVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete MuEntryVariables."); - throw; + std::terminate(); } } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h index ca0cb290c37..dc6ae08acb3 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/TruthVariables.h @@ -43,7 +43,7 @@ class TruthVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete TruthVariables."); - throw; + std::terminate(); } } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h index 3d4f507ba64..5842fa59953 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCDigitVariables.h @@ -68,7 +68,7 @@ class sTGCDigitVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete sTGCDigitVariables."); - throw; + std::terminate(); } } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h index 5c34fa29752..cb8580b362f 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCFastDigitVariables.h @@ -46,7 +46,7 @@ class sTGCFastDigitVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete sTGCFastDigitVariables."); - throw; + std::terminate(); } } diff --git a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h index becf773168a..8fa9922abea 100644 --- a/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h +++ b/MuonSpectrometer/MuonValidation/MuonPRDTest/src/sTGCSimHitVariables.h @@ -78,7 +78,7 @@ class sTGCSimHitVariables : public ValAlgVariables { if( (this->deleteVariables()).isFailure() ){ ATH_MSG_ERROR("Failing to delete sTGCSimHitVariables."); - throw; + std::terminate(); } } -- GitLab