Mesa (master): glsl: fix MSVC int->bool conversion warning

Brian Paul brianp at kemper.freedesktop.org
Thu Oct 31 14:38:41 UTC 2013


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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Oct 29 14:09:46 2013 -0600

glsl: fix MSVC int->bool conversion warning

---

 src/glsl/glsl_types.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h
index fdb1f3a..96eee5e 100644
--- a/src/glsl/glsl_types.h
+++ b/src/glsl/glsl_types.h
@@ -459,7 +459,7 @@ struct glsl_type {
     */
    bool contains_atomic() const
    {
-      return atomic_size();
+      return atomic_size() > 0;
    }
 
    /**




More information about the mesa-commit mailing list