[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1454-g57a4e9c

[Rob Savoye]

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  57a4e9c2c32202cd8625a807f7bd5f55e4bf8933 (commit)
      from  2f7a683cc61c8911d12828041c81b2fa1704036d (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=57a4e9c2c32202cd8625a807f7bd5f55e4bf8933


commit 57a4e9c2c32202cd8625a807f7bd5f55e4bf8933
Author: Rob Savoye <address@hidden>
Date:   Mon Mar 26 15:47:13 2012 -0600

    cast 0 so comparisons with pointers doesn't generate a compiler warning

diff --git a/cygnal/libamf/element.cpp b/cygnal/libamf/element.cpp
index 692161f..81d131d 100644
--- a/cygnal/libamf/element.cpp
+++ b/cygnal/libamf/element.cpp
@@ -481,7 +481,7 @@ Element::encode(bool notobject)
        if (!notobject) {
            *buf = Element::OBJECT_AMF0;
        }
-       if (_name > 0) {
+       if (_name > static_cast<char *>(0)) {
            size_t length = getNameSize();
            boost::uint16_t enclength = length;
            swapBytes(&enclength, 2);
diff --git a/cygnal/libamf/lcshm.cpp b/cygnal/libamf/lcshm.cpp
index 5fdb8db..70558d6 100644
--- a/cygnal/libamf/lcshm.cpp
+++ b/cygnal/libamf/lcshm.cpp
@@ -516,7 +516,7 @@ LcShm::connect(const string& names)
         return false;
     }
 
-    if (SharedMem::begin() <= 0) {
+    if (SharedMem::begin() <= static_cast<unsigned char *>(0)) {
         log_error(_("Failed to open shared memory segment: \"%s\""), 
names.c_str());
         return false; 
     }
@@ -557,7 +557,7 @@ LcShm::connect(key_t key)
         return false;
     }
 
-    if (SharedMem::begin() <= 0) {
+    if (SharedMem::begin() <= static_cast<unsigned char *>(0)) {
         log_error(_("Failed to open shared memory segment: 0x%x"), key);
         return false; 
     }
diff --git a/cygnal/libnet/network.cpp b/cygnal/libnet/network.cpp
index 12f08c8..050aa0b 100644
--- a/cygnal/libnet/network.cpp
+++ b/cygnal/libnet/network.cpp
@@ -564,7 +564,7 @@ Network::createClient(const string &hostname, short port)
     }
 
     const struct hostent *hent = ::gethostbyname(hostname.c_str());
-    if (hent > 0) {
+    if (hent > static_cast< const struct hostent *>(0)) {
         ::memcpy(&sock_in.sin_addr, hent->h_addr, hent->h_length);
     }
     sock_in.sin_family = AF_INET;
diff --git a/utilities/soldumper.cpp b/utilities/soldumper.cpp
index b78168d..68f12f0 100644
--- a/utilities/soldumper.cpp
+++ b/utilities/soldumper.cpp
@@ -173,7 +173,7 @@ main(int argc, char *argv[])
             entry = readdir(library_dir);
         }
         if (library_dir != NULL) {
-            for (i=0; entry>0; i++) {
+            for (i=0; entry>static_cast<struct dirent *>(0); i++) {
                 entry = readdir(library_dir);
                 if (entry != NULL) {
                     //string::size_type pos;

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

Summary of changes:
 cygnal/libamf/element.cpp |    2 +-
 cygnal/libamf/lcshm.cpp   |    4 ++--
 cygnal/libnet/network.cpp |    2 +-
 utilities/soldumper.cpp   |    2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash