[Gnash-commit] gnash ChangeLog server/swf_function.h server/sw...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/24 00:47:28

Modified files:
        .              : ChangeLog 
        server         : swf_function.h swf_function.cpp 

Log message:
                * server/swf_function.h, server/swf_function.cpp:
                  added missing include, out-lined set_length to avoid
                  action_buffer.h include.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.696&r2=1.697
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf_function.cpp?cvsroot=gnash&r1=1.1&r2=1.2

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.696
retrieving revision 1.697
diff -u -b -r1.696 -r1.697
--- ChangeLog   24 Aug 2006 00:42:12 -0000      1.696
+++ ChangeLog   24 Aug 2006 00:47:28 -0000      1.697
@@ -1,5 +1,8 @@
 2006-08-23 Sandro Santilli  <address@hidden>
 
+       * server/swf_function.h, server/swf_function.cpp:
+         added missing include, out-lined set_length to avoid
+         action_buffer.h include.
        * server/impl.h, server/swf_event.h, sprite_instance.cpp:
          moved swf_event class into its own header.
        * server/swf/ASHandlers.cpp (CommonGetUrl): simplified and fixed

Index: server/swf_function.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf_function.h       7 Jul 2006 13:49:40 -0000       1.1
+++ server/swf_function.h       24 Aug 2006 00:47:28 -0000      1.2
@@ -45,6 +45,7 @@
 
 #include "impl.h"
 #include "as_function.h" // for inheritance
+#include "with_stack_entry.h" // for composition (vector element)
 
 #include <cassert>
 
@@ -151,13 +152,7 @@
                m_args.back().m_name = name;
        }
 
-       void    set_length(int len)
-       {
-               assert(m_action_buffer);
-               assert(len >= 0);
-               assert(m_start_pc+len <= m_action_buffer->size());
-               m_length = len;
-       }
+       void    set_length(int len);
 
        /// Dispatch.
        void    operator()(const fn_call& fn);

Index: server/swf_function.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf_function.cpp     7 Jul 2006 13:49:40 -0000       1.1
+++ server/swf_function.cpp     24 Aug 2006 00:47:28 -0000      1.2
@@ -46,6 +46,7 @@
 #include <gnash.h>
 #include <fn_call.h>
 #include <sprite_instance.h>
+#include <action_buffer.h>
 
 #include <typeinfo>
 #include <iostream>
@@ -257,5 +258,14 @@
        }
 }
 
+void
+swf_function::set_length(int len)
+{
+       assert(m_action_buffer);
+       assert(len >= 0);
+       assert(m_start_pc+len <= m_action_buffer->size());
+       m_length = len;
+}
+
 } // end of gnash namespace