Skip to content
Snippets Groups Projects
Commit fad4671a authored by Julien Maurer's avatar Julien Maurer
Browse files

Merge branch 'TBBWarningSuppress-main-20230706' into '23.0'

Suppress TBB Warnings with C++20, 23.0 branch (2023.07.06.)

See merge request atlas/athena!64172
parents 2c9cd57f 1d08d3e1
No related branches found
No related tags found
No related merge requests found
// This file's extension implies that it's C, but it's really -*- C++ -*-.
/*
Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration
Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
// $Id$
......@@ -130,7 +130,18 @@ private:
#include "boost/thread/shared_mutex.hpp"
#include "boost/thread/tss.hpp"
// See ATLINFR-4996 for an explanation of this clunky
// warning suppression.
#if __cplusplus > 201703L
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-volatile"
#endif // >C++17
#include "tbb/concurrent_vector.h"
#if __cplusplus > 201703L
#pragma clang diagnostic pop
#endif // >C++17
#include <atomic>
#include <mutex>
#include <thread>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment