From 0028299932b84b0bfc479eba2437e8bf28177736 Mon Sep 17 00:00:00 2001 From: Attila Krasznahorkay <Attila.Krasznahorkay@cern.ch> Date: Mon, 11 Jan 2021 10:24:11 +0100 Subject: [PATCH] Taught CxxUtils about the SYCL_LANGUAGE_VERSION macro. The Intel compiler is no longer using the macro name CL_SYCL_LANGUAGE_VERSION, but rather SYCL_LANGUAGE_VERSION. At the same time still kept the CL_SYCL_LANGUAGE_VERSION check around as well, in case we would try to build the code with an older version of the Intel compiler. --- Control/CxxUtils/CxxUtils/features.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Control/CxxUtils/CxxUtils/features.h b/Control/CxxUtils/CxxUtils/features.h index 1e2fd23f4063..2cf6267238fe 100644 --- a/Control/CxxUtils/CxxUtils/features.h +++ b/Control/CxxUtils/CxxUtils/features.h @@ -1,9 +1,7 @@ // This file's extension implies that it's C, but it's really -*- C++ -*-. /* - Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration + Copyright (C) 2002-2021 CERN for the benefit of the ATLAS collaboration */ -/* - */ /** * @file CxxUtils/features.h * @author scott snyder <snyder@bnl.gov> @@ -18,7 +16,8 @@ /// the target attribute #if defined(__ELF__) && defined(__GNUC__) && !defined(__CLING__) && \ !defined(__ICC) && !defined(__COVERITY__) && !defined(__CUDACC__) && \ - !defined(CL_SYCL_LANGUAGE_VERSION) && !defined(__HIP__) + !defined(CL_SYCL_LANGUAGE_VERSION) && !defined(SYCL_LANGUAGE_VERSION) && \ + !defined(__HIP__) # define HAVE_FUNCTION_MULTIVERSIONING 1 #else # define HAVE_FUNCTION_MULTIVERSIONING 0 -- GitLab