[Gnash-commit] gnash ChangeLog server/parser/action_buffer.cpp...

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   08/03/27 13:41:26

Modified files:
        .              : ChangeLog 
        server/parser  : action_buffer.cpp action_buffer.h 

Log message:
                * server/parser/action_buffer.{cpp,h}: fix very annoying
                  g++4.3 compiler warnings about parentheses, use at() to
                  access vectors, don't cast away constness in hexify call.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6044&r2=1.6045
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.cpp?cvsroot=gnash&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/action_buffer.h?cvsroot=gnash&r1=1.26&r2=1.27

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6044
retrieving revision 1.6045
diff -u -b -r1.6044 -r1.6045
--- ChangeLog   27 Mar 2008 13:07:33 -0000      1.6044
+++ ChangeLog   27 Mar 2008 13:41:25 -0000      1.6045
@@ -1,5 +1,11 @@
 2008-03-27 Benjamin Wolsey <address@hidden>
 
+       * server/parser/action_buffer.{cpp,h}: fix very annoying
+         g++4.3 compiler warnings about parentheses, use at() to
+         access vectors, don't cast away constness in hexify call.
+
+2008-03-27 Benjamin Wolsey <address@hidden>
+
        * backend/render_handler_agg.h,render_handler.h: include
          dsodefs.h
        * libbase/dsodefs.h: include gnashconfig.h so DSOEXPORT

Index: server/parser/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- server/parser/action_buffer.cpp     5 Mar 2008 11:54:32 -0000       1.37
+++ server/parser/action_buffer.cpp     27 Mar 2008 13:41:26 -0000      1.38
@@ -240,7 +240,7 @@
        {
            for (int i = 0; i < length; i++) {
 
-               ss << "0x" << hexify((boost::uint8_t *)&instruction_data[3 + 
i], 1, false) << " ";
+               ss << "0x" << hexify((const boost::uint8_t 
*)&instruction_data[3 + i], 1, false) << " ";
            }
        }
        else if (fmt == ARG_STR)

Index: server/parser/action_buffer.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/action_buffer.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- server/parser/action_buffer.h       21 Jan 2008 20:56:00 -0000      1.26
+++ server/parser/action_buffer.h       27 Mar 2008 13:41:26 -0000      1.27
@@ -70,7 +70,7 @@
 
        bool is_null() const
        {
-               return m_buffer.size() < 1 || m_buffer[0] == 0;
+               return (m_buffer.size() < 1 || m_buffer.at(0) == 0);
        }
 
        // kept for backward compatibility, should drop and see
@@ -102,31 +102,31 @@
        /// Store its length in the passed boost::uint8_t.
        boost::uint32_t read_V32(size_t pc, boost::uint8_t& length) const
        {
-               boost::uint32_t res = m_buffer[pc];
+               boost::uint32_t res = m_buffer.at(pc);
                if (!(res & 0x00000080))
                {
                        length = 1;
                        return res;
                }
-               res = res & 0x0000007F | m_buffer[pc + 1] << 7;
+               res = (res & 0x0000007F) | (m_buffer.at(pc + 1) << 7);
                if (!(res & 0x00004000))
                {
                        length = 2;
                        return res;
                }
-               res = res & 0x00003FFF | m_buffer[pc + 2] << 14;
+               res = (res & 0x00003FFF) | (m_buffer.at(pc + 2) << 14);
                if (!(res & 0x00200000))
                {
                        length = 3;
                        return res;
                }
-               res = res & 0x001FFFFF | m_buffer[pc + 3] << 21;
+               res = (res & 0x001FFFFF) | (m_buffer.at(pc + 3) << 21);
                if (!(res & 0x10000000))
                {
                        length = 4;
                        return res;
                }
-               res = res & 0x0FFFFFFF | m_buffer[pc + 4] << 28;
+               res = (res & 0x0FFFFFFF) | (m_buffer.at(pc + 4) << 28);
                length = 5;
                return res;
        }
@@ -134,7 +134,7 @@
     /// Get a pointer to the current instruction within the code
        const unsigned char* getFramePointer(size_t pc) const
        {
-               return reinterpret_cast<const unsigned char*>(&m_buffer[pc]);
+               return reinterpret_cast<const unsigned char*>(&m_buffer.at(pc));
        }
 
         /// Get the base pointer of the code buffer.
@@ -146,7 +146,7 @@
        const unsigned char* get_buffer(size_t pc) const
        {
                //assert(pc < m_buffer.size() );
-               return (const unsigned char*)(&m_buffer[pc]);
+               return (const unsigned char*)(&m_buffer.at(pc));
        }
 
        /// Get a signed integer value from given offset
@@ -155,7 +155,7 @@
        ///
        boost::int16_t read_int16(size_t pc) const
        {
-               boost::int16_t ret = m_buffer[pc] | (m_buffer[pc + 1] << 8);
+               boost::int16_t ret = (m_buffer.at(pc) | (m_buffer.at(pc + 1) << 
8));
                return ret;
        }
 
@@ -175,9 +175,9 @@
        boost::int32_t read_int32(size_t pc) const
        {
                boost::int32_t  val = m_buffer[pc]
-                     | (m_buffer[pc + 1] << 8)
-                     | (m_buffer[pc + 2] << 16)
-                     | (m_buffer[pc + 3] << 24);
+                     | (m_buffer.at(pc + 1) << 8)
+                     | (m_buffer.at(pc + 2) << 16)
+                     | (m_buffer.at(pc + 3) << 24);
                return val;
        }
 
@@ -203,7 +203,7 @@
        /// Return a value from the constant pool
        const char* dictionary_get(size_t n) const
        {
-               return m_dictionary[n];
+               return m_dictionary.at(n);
        }
 
        /// Interpret the SWF::ACTION_CONSTANTPOOL opcode.