[libclc] 01/21: Avoid ambiguity in calling atom_add functions.

[Andreas Boll]

This is an automated email from the git hooks/post-receive script.

aboll-guest pushed a commit to branch master
in repository libclc.

commit 9040bf38a282b7dd887e63dba35b59a61a6ec500
Author: Jan Vesely <jan.vesely at rutgers.edu>
Date:   Wed Sep 7 22:11:02 2016 +0000

    Avoid ambiguity in calling atom_add functions.
    
    clang (since r280553) allows pointer casts in function overloads,
    so we need to disambiguate the second argument.
    
    clang might be smarter about overloads in the future
    see https://reviews.llvm.org/D24113, but let's be safe in libclc anyway.
    
    git-svn-id: https://llvm.org/svn/llvm-project/libclc/trunk@280871 91177308-0d34-0410-b5e6-96231b3b80d8
---
 generic/lib/cl_khr_global_int32_base_atomics/atom_dec.cl | 2 +-
 generic/lib/cl_khr_global_int32_base_atomics/atom_inc.cl | 2 +-
 generic/lib/cl_khr_local_int32_base_atomics/atom_dec.cl  | 2 +-
 generic/lib/cl_khr_local_int32_base_atomics/atom_inc.cl  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/generic/lib/cl_khr_global_int32_base_atomics/atom_dec.cl b/generic/lib/cl_khr_global_int32_base_atomics/atom_dec.cl
index a74158d..cc24d2f 100644
--- a/generic/lib/cl_khr_global_int32_base_atomics/atom_dec.cl
+++ b/generic/lib/cl_khr_global_int32_base_atomics/atom_dec.cl
@@ -2,7 +2,7 @@
 
 #define IMPL(TYPE) \
 _CLC_OVERLOAD _CLC_DEF TYPE atom_dec(global TYPE *p) { \
-  return atom_sub(p, 1); \
+  return atom_sub(p, (TYPE)1); \
 }
 
 IMPL(int)
diff --git a/generic/lib/cl_khr_global_int32_base_atomics/atom_inc.cl b/generic/lib/cl_khr_global_int32_base_atomics/atom_inc.cl
index 1404b5a..9193ae3 100644
--- a/generic/lib/cl_khr_global_int32_base_atomics/atom_inc.cl
+++ b/generic/lib/cl_khr_global_int32_base_atomics/atom_inc.cl
@@ -2,7 +2,7 @@
 
 #define IMPL(TYPE) \
 _CLC_OVERLOAD _CLC_DEF TYPE atom_inc(global TYPE *p) { \
-  return atom_add(p, 1); \
+  return atom_add(p, (TYPE)1); \
 }
 
 IMPL(int)
diff --git a/generic/lib/cl_khr_local_int32_base_atomics/atom_dec.cl b/generic/lib/cl_khr_local_int32_base_atomics/atom_dec.cl
index d22c333..cfb3d80 100644
--- a/generic/lib/cl_khr_local_int32_base_atomics/atom_dec.cl
+++ b/generic/lib/cl_khr_local_int32_base_atomics/atom_dec.cl
@@ -2,7 +2,7 @@
 
 #define IMPL(TYPE) \
 _CLC_OVERLOAD _CLC_DEF TYPE atom_dec(local TYPE *p) { \
-  return atom_sub(p, 1); \
+  return atom_sub(p, (TYPE)1); \
 }
 
 IMPL(int)
diff --git a/generic/lib/cl_khr_local_int32_base_atomics/atom_inc.cl b/generic/lib/cl_khr_local_int32_base_atomics/atom_inc.cl
index 4ba0d06..8ea4738 100644
--- a/generic/lib/cl_khr_local_int32_base_atomics/atom_inc.cl
+++ b/generic/lib/cl_khr_local_int32_base_atomics/atom_inc.cl
@@ -2,7 +2,7 @@
 
 #define IMPL(TYPE) \
 _CLC_OVERLOAD _CLC_DEF TYPE atom_inc(local TYPE *p) { \
-  return atom_add(p, 1); \
+  return atom_add(p, (TYPE)1); \
 }
 
 IMPL(int)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-opencl/libclc.git