summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorAlbert Freeman <[email protected]>2015-09-08 13:06:40 +0000
committerEmil Velikov <[email protected]>2015-09-11 19:19:32 +0100
commit7d79ad95fd629730dc7bb8e56e4273505adbcf4b (patch)
treefaa7a4fe9d446a46d657bd39175198a60447e6f5 /src/gallium
parent2becc9864598eddc47c21f7d858f0d9c12894172 (diff)
clover: Avoid using typename to allow compilation of clover by clang
When parsing an variable declaration qualified with the typename keyword, clang attempted to declare a variable with the type of non type member "enum type type" of module::argument (within the header file clover/core/module.hpp) instead of the typed member of module::argument "enum type". Replaced "typename" with "enum" to force clang to declare the variable marg_type with type "enum type" of module::argument. CC: "11.0" <[email protected]> Reviewed-by: Francisco Jerez <[email protected]> Reviewed-by: Emil Velikov <[email protected]> Signed-off-by: Albert Freeman <[email protected]> (cherry picked from commit 1691ead1b8ae4018a805af58977a43ef90af4203)
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/state_trackers/clover/llvm/invocation.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 7c23a27150b..d74b50df45a 100644
--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
+++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -465,7 +465,7 @@ namespace {
const bool is_write_only = access_qual == "write_only";
const bool is_read_only = access_qual == "read_only";
- typename module::argument::type marg_type;
+ enum module::argument::type marg_type;
if (is_image2d && is_read_only) {
marg_type = module::argument::image2d_rd;
} else if (is_image2d && is_write_only) {