From 7b46232ad25ae3573f27460eb70e9fdff9428f0b Mon Sep 17 00:00:00 2001
From: scott snyder <sss@karma>
Date: Thu, 18 Mar 2021 23:02:25 -0400
Subject: [PATCH] AthContainers: c++20 fix
std::is_pod is deprecated.
---
.../AthContainers/AthContainers/tools/AuxTypeVector.icc | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Control/AthContainers/AthContainers/tools/AuxTypeVector.icc b/Control/AthContainers/AthContainers/tools/AuxTypeVector.icc
index b3269cadbb47..1c320df47473 100644
--- a/Control/AthContainers/AthContainers/tools/AuxTypeVector.icc
+++ b/Control/AthContainers/AthContainers/tools/AuxTypeVector.icc
@@ -1,8 +1,6 @@
/*
- Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration
*/
-
-// $Id$
/**
* @file AthContainers/tools/AuxTypeVector.icc
* @author scott snyder <snyder@bnl.gov>
@@ -421,7 +419,8 @@ bool AuxTypeVectorHolder<T, CONT>::insertMove (size_t pos, void* beg, void* end)
insertMove1 (m_vecPtr->begin() + pos*SCALE,
reinterpret_cast<element_type*> (beg),
reinterpret_cast<element_type*> (end),
- typename std::is_pod<element_type>::type());
+ typename std::conjunction<std::is_standard_layout<element_type>,
+ std::is_trivial<element_type> >::type());
return m_vecPtr->data() == orig;
}
--
GitLab