[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1689-g41175fa

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  41175fa671a06c3cb942b9aa78cdf5d337e67402 (commit)
       via  cbea309cd3193f1a6936e44cd8de2748a10a48ba (commit)
      from  8603e08253b3c60aca5c775ccf1cd576535c7cf0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=41175fa671a06c3cb942b9aa78cdf5d337e67402


commit 41175fa671a06c3cb942b9aa78cdf5d337e67402
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Jul 30 22:21:47 2013 +0200

    Fix warning: narrowing conversion of '-1' from 'int' to 'GLenum {aka 
unsigned int}' inside { } is ill-formed in C++11.
    
    Dropped ~0 entry and used iterators instead.

diff --git a/librender/GnashTexture.cpp b/librender/GnashTexture.cpp
index 0299914..d024296 100644
--- a/librender/GnashTexture.cpp
+++ b/librender/GnashTexture.cpp
@@ -32,14 +32,15 @@
 
 namespace gnash {
 
+struct gl_errors_t {
+     GLenum val;
+     const char *str;
+};
+
 // Returns a string representation of an OpenGL error
 static const char *gl_get_error_string(GLenum error)
 {
-    static const struct {
-        GLenum val;
-        const char *str;
-    }
-    gl_errors[] = {
+    gl_errors_t gl_errors[] = {
         { GL_NO_ERROR,          "no error" },
         { GL_INVALID_ENUM,      "invalid enumerant" },
         { GL_INVALID_VALUE,     "invalid value" },
@@ -50,13 +51,12 @@ static const char *gl_get_error_string(GLenum error)
 #ifdef GL_INVALID_FRAMEBUFFER_OPERATION_EXT
         { GL_INVALID_FRAMEBUFFER_OPERATION_EXT, "invalid framebuffer 
operation" },
 #endif
-        { ~0, NULL }
     };
 
-    int i;
-    for (i = 0; gl_errors[i].str; i++) {
-        if (gl_errors[i].val == error)
-            return gl_errors[i].str;
+    for (gl_errors_t *it = boost::begin(gl_errors), *end = 
boost::end(gl_errors);
+         it != end; ++it) {
+        if (it->val == error)
+            return it->str;
     }
     return "unknown";
 }

http://git.savannah.gnu.org/cgit//commit/?id=cbea309cd3193f1a6936e44cd8de2748a10a48ba


commit cbea309cd3193f1a6936e44cd8de2748a10a48ba
Author: Bastiaan Jacques <address@hidden>
Date:   Tue Jul 30 11:10:47 2013 +0200

    Improve configure sysroot error message.

diff --git a/configure.ac b/configure.ac
index b481bda..9120dff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -256,7 +256,7 @@ if test x"${cross_compiling}" != x; then
     if test -d ${with_top_level}/include; then
       with_top_level=${withval}
     else
-      AC_MSG_ERROR([Specified sysroot \"${with_top_level}\" doesn't exist!])
+      AC_MSG_ERROR([Specified sysroot \"${with_top_level}/include\" doesn't 
exist!])
     fi
   fi
 fi

-----------------------------------------------------------------------

Summary of changes:
 configure.ac               |    2 +-
 librender/GnashTexture.cpp |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)


hooks/post-receive
-- 
Gnash