Skip to content
Snippets Groups Projects
Commit e54f0b19 authored by Attila Krasznahorkay's avatar Attila Krasznahorkay Committed by Walter Lampl
Browse files

GCC Clang Pragma Warning Fix, 23.0 branch (2023.07.10.)

Only allow Cling to see the warning suppression pragmas.

As it turns out, GCC is very touchy about seeing pragmas that are
not meant for it. So we need to only expose these pragmas to the
ROOT dictionary generation. Even Clang as the main C++ compiler
does not need to see them.
parent 0ec87a10
No related branches found
No related tags found
No related merge requests found
......@@ -133,14 +133,14 @@ private:
// See ATLINFR-4996 for an explanation of this clunky
// warning suppression.
#if __cplusplus > 201703L
#if (__cplusplus > 201703L) && defined(__ROOTCLING__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-volatile"
#endif // >C++17
#endif // >C++17 with ROOT
#include "tbb/concurrent_vector.h"
#if __cplusplus > 201703L
#if (__cplusplus > 201703L) && defined(__ROOTCLING__)
#pragma clang diagnostic pop
#endif // >C++17
#endif // >C++17 with ROOT
#include <atomic>
#include <mutex>
......@@ -191,7 +191,7 @@ namespace AthContainers_detail {
* lock on the underlying object rather than an exclusive one.
*/
template <typename LOCKABLE>
class strict_shared_lock
class strict_shared_lock
{
public:
/// The underlying object type.
......@@ -210,7 +210,7 @@ public:
* @param obj The lockable object.
*/
explicit strict_shared_lock(const lockable_type& obj);
/**
* @brief Release the held lock.
......
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