On 07/26/2013 10:55 PM, Ian Romanick wrote:
From: Ian Romanick <[email protected]>
The second 'const' says that the pointer itself is constant. This in
unenforcible in C++, so GCC emits a warning (see) below for each of
these functions in every file that includes glsl_types.h. It's a lot of
warning spam.
../../../src/glsl/glsl_types.h:176:58: warning: type qualifiers ignored on
function return type [-Wignored-qualifiers]
Signed-off-by: Ian Romanick <[email protected]>
Cc: [email protected]
Cc: Kenneth Graunke <[email protected]>
---
src/glsl/glsl_types.cpp | 8 ++++----
src/glsl/glsl_types.h | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 9d3691b..8324b8a 100644
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -281,7 +281,7 @@ glsl_type::glsl_type(const glsl_type *array, unsigned
length) :
}
-const glsl_type *const
+const glsl_type *
glsl_type::vec(unsigned components)
{
if (components == 0 || components > 4)
@@ -294,7 +294,7 @@ glsl_type::vec(unsigned components)
}
-const glsl_type *const
+const glsl_type *
glsl_type::ivec(unsigned components)
{
if (components == 0 || components > 4)
@@ -307,7 +307,7 @@ glsl_type::ivec(unsigned components)
}
-const glsl_type *const
+const glsl_type *
glsl_type::uvec(unsigned components)
{
if (components == 0 || components > 4)
@@ -320,7 +320,7 @@ glsl_type::uvec(unsigned components)
}
-const glsl_type *const
+const glsl_type *
glsl_type::bvec(unsigned components)
{
if (components == 0 || components > 4)
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index cb52080..8172309 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -170,10 +170,10 @@ struct glsl_type {
* Convenience accessors for vector types (shorter than get_instance()).
* @{
*/
- static const glsl_type *const vec(unsigned components);
- static const glsl_type *const ivec(unsigned components);
- static const glsl_type *const uvec(unsigned components);
- static const glsl_type *const bvec(unsigned components);
+ static const glsl_type *vec(unsigned components);
+ static const glsl_type *ivec(unsigned components);
+ static const glsl_type *uvec(unsigned components);
+ static const glsl_type *bvec(unsigned components);
/**@}*/
/**
Strange, I don't get those warnings. It makes sense to drop the extra
const, though.
Reviewed-by: Kenneth Graunke <[email protected]>
_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
