[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1246-g3c5d32e

[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  3c5d32e34516e7c87ca754f44b59cc28657d97ad (commit)
      from  29f3591db99bfe54a912d75f733819bc299ee51b (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=3c5d32e34516e7c87ca754f44b59cc28657d97ad


commit 3c5d32e34516e7c87ca754f44b59cc28657d97ad
Author: Rob Savoye <address@hidden>
Date:   Wed Nov 30 10:10:21 2011 -0700

    cleanup various compilation warnings and errors so make check works with 
-pedantic

diff --git a/cygnal/handler.h b/cygnal/handler.h
index ee2577f..decc1e9 100644
--- a/cygnal/handler.h
+++ b/cygnal/handler.h
@@ -79,7 +79,7 @@ public:
        POLL,
        HELP,
        INTERVAL,
-       QUIT,
+       QUIT
     } admin_cmd_e;
     /// This enum contains the possible values for streaming video
     /// types.
diff --git a/cygnal/testsuite/cygnal.all/Makefile.am 
b/cygnal/testsuite/cygnal.all/Makefile.am
index 79c89d8..4d0ec1c 100644
--- a/cygnal/testsuite/cygnal.all/Makefile.am
+++ b/cygnal/testsuite/cygnal.all/Makefile.am
@@ -26,14 +26,14 @@ libcygnal_la_SOURCES = \
        $(top_builddir)/cygnal/crc.cpp
 
 libcygnal_la_LDFLAGS = \
-       $(top_builddir)/libamf/libgnashamf.la
+       $(top_builddir)/cygnal/libamf/libgnashamf.la
 
 AM_CPPFLAGS = # -Wall
 
 AM_LDFLAGS = \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libnet/libgnashnet.la \
+       $(top_builddir)/cygnal/libamf/libgnashamf.la \
+       $(top_builddir)//cygnal/libnet/libgnashnet.la \
        $(top_builddir)/cygnal/libcygnal.la \
        $(BOOST_LIBS) \
        $(NULL)
@@ -41,10 +41,11 @@ AM_LDFLAGS = \
 localedir = $(datadir)/locale
 
 INCLUDES = \
-        -I$(top_srcdir)/libamf \
-        -I$(top_srcdir)/libnet \
+        -I$(top_srcdir)/cygnal/libamf \
+        -I$(top_srcdir)/cygnal/libnet \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/cygnal \
+        -I$(top_srcdir)/testsuite \
         -I$(top_srcdir)/libcore \
         -DLOCALEDIR=\"$(localedir)\" \
                $(BOOST_CFLAGS) \
diff --git a/cygnal/testsuite/cygnal.all/test_crc.cpp 
b/cygnal/testsuite/cygnal.all/test_crc.cpp
index 49968ad..21c741a 100644
--- a/cygnal/testsuite/cygnal.all/test_crc.cpp
+++ b/cygnal/testsuite/cygnal.all/test_crc.cpp
@@ -37,6 +37,8 @@
 #include <iostream>
 #include <fstream>
 #include <string>
+#include "log.h"
+#include "crc.h"
 
 #ifdef HAVE_DEJAGNU_H
 #include "dejagnu.h"
@@ -44,9 +46,6 @@
 #include "check.h"
 #endif
 
-#include "log.h"
-#include "crc.h"
-
 using namespace std;
 using namespace gnash;
 using namespace cygnal;
diff --git a/cygnal/testsuite/libamf.all/test_amf.cpp 
b/cygnal/testsuite/libamf.all/test_amf.cpp
index 4686424..6067e32 100644
--- a/cygnal/testsuite/libamf.all/test_amf.cpp
+++ b/cygnal/testsuite/libamf.all/test_amf.cpp
@@ -74,7 +74,7 @@ LogFile& dbglogfile = LogFile::getDefaultInstance();
 RcInitFile& rcfile = RcInitFile::getDefaultInstance();
 
 int
-main(int argc, char *argv[])
+main(int argc, char **argv)
 {
     const Arg_parser::Option opts[] =
         {
diff --git a/cygnal/testsuite/libamf.all/test_amfmsg.cpp 
b/cygnal/testsuite/libamf.all/test_amfmsg.cpp
index 56d18e8..a65c114 100644
--- a/cygnal/testsuite/libamf.all/test_amfmsg.cpp
+++ b/cygnal/testsuite/libamf.all/test_amfmsg.cpp
@@ -68,7 +68,7 @@ LogFile& dbglogfile = LogFile::getDefaultInstance();
 RcInitFile& rcfile = RcInitFile::getDefaultInstance();
 
 int
-main(int argc, char *argv[])
+main(int argc, char **argv)
 {
     const Arg_parser::Option opts[] =
         {
diff --git a/cygnal/testsuite/libamf.all/test_buffer.cpp 
b/cygnal/testsuite/libamf.all/test_buffer.cpp
index dbd1aea..46e3150 100644
--- a/cygnal/testsuite/libamf.all/test_buffer.cpp
+++ b/cygnal/testsuite/libamf.all/test_buffer.cpp
@@ -727,7 +727,7 @@ usage()
 #else
 
 int
-main(int /*argc*/, char /* *argv[]*/)
+main(int /*argc*/, char** /* *argv */)
 {
   // nop
   return 0;  
diff --git a/cygnal/testsuite/libnet.all/Makefile.am 
b/cygnal/testsuite/libnet.all/Makefile.am
index e9ab950..8c27410 100644
--- a/cygnal/testsuite/libnet.all/Makefile.am
+++ b/cygnal/testsuite/libnet.all/Makefile.am
@@ -25,8 +25,8 @@ AM_CPPFLAGS = # -Wall
 
 AM_LDFLAGS = \
        $(top_builddir)/libbase/libgnashbase.la \
-       $(top_builddir)/libamf/libgnashamf.la \
-       $(top_builddir)/libnet/libgnashnet.la \
+       $(top_builddir)/cygnal/libamf/libgnashamf.la \
+       $(top_builddir)/cygnal/libnet/libgnashnet.la \
        $(top_builddir)/libmedia/libgnashmedia.la \
        $(top_builddir)/libsound/libgnashsound.la \
        $(BOOST_LIBS) \
@@ -37,8 +37,8 @@ localedir = $(datadir)/locale
 
 INCLUDES = \
         -I$(top_srcdir)/testsuite \
-        -I$(top_srcdir)/libnet \
-        -I$(top_srcdir)/libamf \
+        -I$(top_srcdir)/cygnal/libnet \
+        -I$(top_srcdir)/cygnal/libamf \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/libltdl \
         -I$(top_srcdir)/cygnal \
diff --git a/cygnal/testsuite/libnet.all/test_cque.cpp 
b/cygnal/testsuite/libnet.all/test_cque.cpp
index 2e8cf79..e96b366 100644
--- a/cygnal/testsuite/libnet.all/test_cque.cpp
+++ b/cygnal/testsuite/libnet.all/test_cque.cpp
@@ -50,11 +50,10 @@
 #include "cque.h"
 #include "amf.h"
 
-using namespace amf;
+using namespace cygnal;
 using namespace std;
 using namespace gnash;
 using namespace boost;
-using namespace amf;
 
 TestState runtest;
 //LogFile& dbglogfile = LogFile::getDefaultInstance();
@@ -66,7 +65,7 @@ main (int /*argc*/, char** /*argv*/) {
 
     CQue que;
 
-    boost::shared_ptr<amf::Buffer> buf(new Buffer(50));
+    boost::shared_ptr<cygnal::Buffer> buf(new Buffer(50));
     // populate the buffer
     boost::uint8_t *ptr = buf->reference();
     for (Network::byte_t i=1; i< buf->size(); i++) {
@@ -81,19 +80,19 @@ main (int /*argc*/, char** /*argv*/) {
     // which is the one where data flows from the network to the queue.
     que.push(buf);
     if (que.size() == 1) {
-        runtest.pass ("CQue::push(boost::shared_ptr<amf::Buffer> )");
+        runtest.pass ("CQue::push(boost::shared_ptr<cygnal::Buffer> )");
     } else {
-        runtest.fail ("CQue::push(boost::shared_ptr<amf::Buffer> )");
+        runtest.fail ("CQue::push(boost::shared_ptr<cygnal::Buffer> )");
     }
     
     // Test push. When dumpimg, the second address should be different than 
the first,
     // as well as the size. The outgoing queue should be uneffected.
-    boost::shared_ptr<amf::Buffer> buf1(new Buffer(112));
+    boost::shared_ptr<cygnal::Buffer> buf1(new Buffer(112));
     que.push(buf1);
     if (que.size() == 2) {
-        runtest.pass ("CQue::pushin(boost::shared_ptr<amf::Buffer> )");
+        runtest.pass ("CQue::pushin(boost::shared_ptr<cygnal::Buffer> )");
     } else {
-        runtest.fail ("CQue::pushin(boost::shared_ptr<amf::Buffer> )");
+        runtest.fail ("CQue::pushin(boost::shared_ptr<cygnal::Buffer> )");
     }
 
     // Nuke the array
@@ -106,14 +105,14 @@ main (int /*argc*/, char** /*argv*/) {
 
     
     que.push(buf);
-    boost::shared_ptr<amf::Buffer> buf2 = que.peek();
+    boost::shared_ptr<cygnal::Buffer> buf2 = que.peek();
     if ((buf2 == buf) && (que.size() == 1)) {
         runtest.pass ("CQue::peek()");
     } else {
         runtest.fail ("CQue::peek()");
     }
 
-    boost::shared_ptr<amf::Buffer> buf3 = que.peek();
+    boost::shared_ptr<cygnal::Buffer> buf3 = que.peek();
      if ((buf3 == buf) && (que.size() == 1)) {
          runtest.pass ("CQue::pop()");
      } else {
@@ -131,18 +130,18 @@ main (int /*argc*/, char** /*argv*/) {
      }
 
      // Make some test buffers
-     boost::shared_ptr<amf::Buffer> merge1(new Buffer);
-     boost::shared_ptr<amf::Buffer> merge2(new Buffer);
-     boost::shared_ptr<amf::Buffer> merge3(new Buffer);
+     boost::shared_ptr<cygnal::Buffer> merge1(new Buffer);
+     boost::shared_ptr<cygnal::Buffer> merge2(new Buffer);
+     boost::shared_ptr<cygnal::Buffer> merge3(new Buffer);
      size_t i;
      ptr = merge1->reference();
-     for (i=0; i<amf::NETBUFSIZE; i++) {
+     for (i=0; i<cygnal::NETBUFSIZE; i++) {
          ptr[i] = i*'A';
      }
      que.push(merge1);
      
      ptr = merge2->reference();
-     for (i=0; i<amf::NETBUFSIZE; i++) {
+     for (i=0; i<cygnal::NETBUFSIZE; i++) {
          ptr[i] = i+'a';
      }
      que.push(merge2);
@@ -156,11 +155,11 @@ main (int /*argc*/, char** /*argv*/) {
 
 //     que.dump();
      // A merge gives us one big buffer where there were several buffers
-     boost::shared_ptr<amf::Buffer> foo = que.merge(merge1);
+     boost::shared_ptr<cygnal::Buffer> foo = que.merge(merge1);
      if (foo == 0) {
          runtest.unresolved("CQue::merge()");
      } else {
-         if (foo->size() == (amf::NETBUFSIZE * 2) + 120) {
+         if (foo->size() == (cygnal::NETBUFSIZE * 2) + 120) {
              runtest.pass("CQue::merge()");
          } else {
              runtest.fail("CQue::merge()");
diff --git a/cygnal/testsuite/libnet.all/test_handler.cpp 
b/cygnal/testsuite/libnet.all/test_handler.cpp
index 26b1992..6599cce 100644
--- a/cygnal/testsuite/libnet.all/test_handler.cpp
+++ b/cygnal/testsuite/libnet.all/test_handler.cpp
@@ -58,11 +58,10 @@
 #include "handler.h"
 #include "amf.h"
 
-using namespace amf;
+using namespace cygnal;
 using namespace std;
 using namespace gnash;
 using namespace boost;
-using namespace amf;
 
 TestState runtest;
 LogFile& dbglogfile = LogFile::getDefaultInstance();

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

Summary of changes:
 cygnal/handler.h                             |    2 +-
 cygnal/testsuite/cygnal.all/Makefile.am      |   11 ++++----
 cygnal/testsuite/cygnal.all/test_crc.cpp     |    5 +--
 cygnal/testsuite/libamf.all/test_amf.cpp     |    2 +-
 cygnal/testsuite/libamf.all/test_amfmsg.cpp  |    2 +-
 cygnal/testsuite/libamf.all/test_buffer.cpp  |    2 +-
 cygnal/testsuite/libnet.all/Makefile.am      |    8 +++---
 cygnal/testsuite/libnet.all/test_cque.cpp    |   33 ++++++++++++-------------
 cygnal/testsuite/libnet.all/test_handler.cpp |    3 +-
 9 files changed, 33 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
Gnash