Mesa (master): clover: Avoid using typename to allow compilation of clover by clang

Emil Velikov evelikov at kemper.freedesktop.org
Thu Sep 10 13:52:25 UTC 2015


Module: Mesa
Branch: master
Commit: 1691ead1b8ae4018a805af58977a43ef90af4203
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1691ead1b8ae4018a805af58977a43ef90af4203

Author: Albert Freeman <albertwdfreeman at gmail.com>
Date:   Tue Sep  8 13:06:40 2015 +0000

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" <mesa-stable at lists.freedesktop.org>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Albert Freeman <albertwdfreeman at gmail.com>

---

 src/gallium/state_trackers/clover/llvm/invocation.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
index 7c23a27..d74b50d 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) {




More information about the mesa-commit mailing list