From 65a99e33ee7e79f29e4d2700c42d2e91851faf4a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkjak@fjfi.cvut.cz>
Date: Wed, 1 Feb 2017 21:56:04 +0100
Subject: [PATCH] Added missing __cuda_callable__ marks
Curiously clang complained about it, but nvcc didn't.
---
src/TNL/Containers/SharedArray_impl.h | 2 ++
src/TNL/Containers/StaticArray3D_impl.h | 1 +
src/TNL/Containers/StaticVector_impl.h | 1 +
3 files changed, 4 insertions(+)
diff --git a/src/TNL/Containers/SharedArray_impl.h b/src/TNL/Containers/SharedArray_impl.h
index afac706c2a..558552a803 100644
--- a/src/TNL/Containers/SharedArray_impl.h
+++ b/src/TNL/Containers/SharedArray_impl.h
@@ -310,6 +310,7 @@ void SharedArray< Element, Device, Index > :: setValue( const Element& e )
template< typename Element,
typename Device,
typename Index >
+__cuda_callable__
const Element* SharedArray< Element, Device, Index > :: getData() const
{
return this->data;
@@ -318,6 +319,7 @@ const Element* SharedArray< Element, Device, Index > :: getData() const
template< typename Element,
typename Device,
typename Index >
+__cuda_callable__
Element* SharedArray< Element, Device, Index > :: getData()
{
return this->data;
diff --git a/src/TNL/Containers/StaticArray3D_impl.h b/src/TNL/Containers/StaticArray3D_impl.h
index 8878ef34b0..a246b2e3e6 100644
--- a/src/TNL/Containers/StaticArray3D_impl.h
+++ b/src/TNL/Containers/StaticArray3D_impl.h
@@ -68,6 +68,7 @@ String StaticArray< 3, Element >::getType()
}
template< typename Element >
+__cuda_callable__
inline int StaticArray< 3, Element >::getSize() const
{
return size;
diff --git a/src/TNL/Containers/StaticVector_impl.h b/src/TNL/Containers/StaticVector_impl.h
index 72b76bd29d..32b8f4b95e 100644
--- a/src/TNL/Containers/StaticVector_impl.h
+++ b/src/TNL/Containers/StaticVector_impl.h
@@ -182,6 +182,7 @@ StaticVector< Size, Real >::abs() const
template< int Size, typename Real, typename Scalar >
+__cuda_callable__
StaticVector< Size, Real > operator * ( const Scalar& c, const StaticVector< Size, Real >& u )
{
return u * c;
--
GitLab