From a70e48644a047a043b97baf752e8bc2772e5c05f Mon Sep 17 00:00:00 2001
From: scott snyder <scott.snyder@cern.ch>
Date: Mon, 18 Mar 2019 14:54:40 +0100
Subject: [PATCH] TileRawUtils: Fix gcc9 warnings.
In C++11, implicit declarations of copy and assignment are deprecated if the
class has a user defined destructor or copy or assignment. gcc9 now warns
about this by default.
Adjust to avoid the warning.
---
.../TileRawUtils/TileRawRoISelector.h | 6 +++---
.../TileRawUtils/src/TileRawRoISelector.cxx | 19 +------------------
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/TileCalorimeter/TileRawUtils/TileRawUtils/TileRawRoISelector.h b/TileCalorimeter/TileRawUtils/TileRawUtils/TileRawRoISelector.h
index f1b35a351ad..45043a9272e 100755
--- a/TileCalorimeter/TileRawUtils/TileRawUtils/TileRawRoISelector.h
+++ b/TileCalorimeter/TileRawUtils/TileRawUtils/TileRawRoISelector.h
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#ifndef TILERAWUTILS_TILERAWROISELECTOR_H
@@ -57,7 +57,7 @@ class TileRawRoISelector
public:
const_iterator() ;
- const_iterator& operator = ( const const_iterator & it ) ;
+ const_iterator& operator = ( const const_iterator & it ) = default;
const_iterator& operator ++ () ;
@@ -86,7 +86,7 @@ class TileRawRoISelector
TileRawRoISelector ( TileRoI_Map* map=NULL,
TileRawChannelContainer* c=NULL );
- virtual ~TileRawRoISelector () {};
+ virtual ~TileRawRoISelector () = default;
void setMap(TileRoI_Map* map) ;
void setContainer(TileRawChannelContainer* c) ;
diff --git a/TileCalorimeter/TileRawUtils/src/TileRawRoISelector.cxx b/TileCalorimeter/TileRawUtils/src/TileRawRoISelector.cxx
index 6172b33ce4f..2f0a6aac33d 100755
--- a/TileCalorimeter/TileRawUtils/src/TileRawRoISelector.cxx
+++ b/TileCalorimeter/TileRawUtils/src/TileRawRoISelector.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration
*/
#include "TileRawUtils/TileRawRoISelector.h"
@@ -40,23 +40,6 @@ TileRawRoISelector::const_iterator::const_iterator
}
-// = operator
-TileRawRoISelector::const_iterator&
-TileRawRoISelector::const_iterator:: operator =
- ( const TileRawRoISelector::const_iterator & it )
-{
- if (this != (&it) ) {
-
- m_vec_itpair = it.m_vec_itpair ;
- m_pair_it = it.m_pair_it ;
- m_obj_it = it.m_obj_it ;
- m_obj_it_end = it.m_obj_it_end ;
- }
-
- return *this;
-}
-
-
// ++ operator
TileRawRoISelector::const_iterator&
TileRawRoISelector::const_iterator:: operator ++ ()
--
GitLab