[Gnash-commit] [SCM] Gnash branch, master, updated. 0597249609dc35bf2c10f5a3b0f7da4ced1ae04e

[Benjamin Wolsey]

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  0597249609dc35bf2c10f5a3b0f7da4ced1ae04e (commit)
       via  8c664bc80d156e70d9b633f589ea3f5098ece4df (commit)
       via  0fe92d32cddedb8048b988d0b5568d38690f9762 (commit)
      from  b902917c56b485381e6de496a125502d0840cd87 (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=0597249609dc35bf2c10f5a3b0f7da4ced1ae04e


commit 0597249609dc35bf2c10f5a3b0f7da4ced1ae04e
Merge: 8c664bc b902917
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Nov 26 09:41:28 2010 +0100

    Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash


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


commit 8c664bc80d156e70d9b633f589ea3f5098ece4df
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Nov 26 08:32:26 2010 +0100

    Drop unneeded include.

diff --git a/libcore/ClassHierarchy.cpp b/libcore/ClassHierarchy.cpp
index ae88be7..8ea107b 100644
--- a/libcore/ClassHierarchy.cpp
+++ b/libcore/ClassHierarchy.cpp
@@ -25,7 +25,6 @@
 #include "as_value.h"
 #include "namedStrings.h"
 #include "as_function.h"
-#include "Class.h"
 #include "Global_as.h"
 #include "extension.h"
 

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


commit 0fe92d32cddedb8048b988d0b5568d38690f9762
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Nov 26 08:31:40 2010 +0100

    Include the required headers.

diff --git a/libcore/ClassHierarchy.cpp b/libcore/ClassHierarchy.cpp
index 2b2e7db..ae88be7 100644
--- a/libcore/ClassHierarchy.cpp
+++ b/libcore/ClassHierarchy.cpp
@@ -16,18 +16,19 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
+#include "ClassHierarchy.h"
+
+#include <boost/bind.hpp>
+
 #include "as_object.h"
 #include "PropFlags.h"
 #include "as_value.h"
 #include "namedStrings.h"
-#include "ClassHierarchy.h"
 #include "as_function.h"
 #include "Class.h"
 #include "Global_as.h"
 #include "extension.h"
 
-#include <boost/bind.hpp>
-
 namespace gnash {
 
 // anonymous namespace
diff --git a/libcore/ClassHierarchy.h b/libcore/ClassHierarchy.h
index da418f6..b82c06e 100644
--- a/libcore/ClassHierarchy.h
+++ b/libcore/ClassHierarchy.h
@@ -27,6 +27,8 @@
 #include <vector>
 #include <iosfwd>
 
+#include "ObjectURI.h"
+
 namespace gnash {
     class Extension;
     class as_object;
diff --git a/libcore/asobj/Global_as.cpp b/libcore/asobj/Global_as.cpp
index fd9200b..2a6a30c 100644
--- a/libcore/asobj/Global_as.cpp
+++ b/libcore/asobj/Global_as.cpp
@@ -18,16 +18,23 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-
 #ifdef HAVE_CONFIG_H
 #include "gnashconfig.h"
 #endif
 
+#include "Global_as.h"
+
+#include <map>
+#include <limits> 
+#include <sstream>
+#include <boost/lexical_cast.hpp>
+#include <boost/assign/list_of.hpp>
+
 #include "as_object.h"
 #include "movie_root.h"
 #include "PropFlags.h"
 #include "as_value.h"
-#include "as_function.h" // for function_class_init
+#include "as_function.h"
 #include "NativeFunction.h" 
 #include "AsBroadcaster.h"
 #include "Boolean_as.h"
@@ -85,12 +92,6 @@
 #include "Object.h"
 #include "LoadableObject.h"
 
-#include <map>
-#include <limits> 
-#include <sstream>
-#include <boost/lexical_cast.hpp>
-#include <boost/assign/list_of.hpp>
-
 // Common code to warn and return if a required single arg is not present
 // and to warn if there are extra args.
 #define ASSERT_FN_ARGS_IS_1                        \

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

Summary of changes:
 libcore/ClassHierarchy.cpp  |    8 ++++----
 libcore/ClassHierarchy.h    |    2 ++
 libcore/asobj/Global_as.cpp |   17 +++++++++--------
 3 files changed, 15 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Gnash