[Gnash-commit] /srv/bzr/gnash/trunk r9786: Commit before merging...

[Benjamin Wolsey]

------------------------------------------------------------
revno: 9786
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Thu 2008-09-18 21:39:37 +0200
message:
  Commit before merging...
modified:
  libcore/asobj/ClassHierarchy.cpp
  libcore/asobj/Global.cpp
  libcore/asobj/System_as.cpp
  libcore/movie_root.h
    ------------------------------------------------------------
    revno: 9783.1.3
    committer: Benjamin Wolsey <address@hidden>
    branch nick: work
    timestamp: Thu 2008-09-18 21:38:37 +0200
    message:
      Missing half of last commit.
      
      Make movie_root inherit from boost::noncopyable rather than DIY.
    modified:
      libcore/asobj/ClassHierarchy.cpp
      libcore/asobj/Global.cpp
      libcore/asobj/System_as.cpp
      libcore/movie_root.h

=== modified file 'libcore/asobj/ClassHierarchy.cpp'
--- a/libcore/asobj/ClassHierarchy.cpp  2008-09-16 17:45:34 +0000
+++ b/libcore/asobj/ClassHierarchy.cpp  2008-09-18 19:38:37 +0000
@@ -49,7 +49,7 @@
 #include "SharedObject.h"
 #include "Sound.h"
 #include "Stage.h"
-#include "System.h"
+#include "System_as.h"
 #include "TextSnapshot.h"
 #include "TextFormat.h"
 #include "video_stream_instance.h"

=== modified file 'libcore/asobj/Global.cpp'
--- a/libcore/asobj/Global.cpp  2008-09-16 17:45:34 +0000
+++ b/libcore/asobj/Global.cpp  2008-09-18 19:38:37 +0000
@@ -55,7 +55,7 @@
 #include "SharedObject.h"
 #include "Sound.h"
 #include "Stage.h"
-#include "System.h"
+#include "System_as.h"
 #include "TextFormat.h"
 #include "TextSnapshot.h"
 #include "video_stream_instance.h"

=== modified file 'libcore/asobj/System_as.cpp'
--- a/libcore/asobj/System_as.cpp       2008-09-18 18:09:55 +0000
+++ b/libcore/asobj/System_as.cpp       2008-09-18 19:38:37 +0000
@@ -21,7 +21,7 @@
 
 #include "movie_root.h" // interface callback
 #include "log.h"
-#include "System.h"
+#include "System_as.h"
 #include "fn_call.h"
 #include "builtin_function.h"
 #include "VM.h" // for getPlayerVersion() 

=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h      2008-09-11 14:20:25 +0000
+++ b/libcore/movie_root.h      2008-09-18 19:38:37 +0000
@@ -96,6 +96,7 @@
 #include <list>
 #include <set>
 #include <bitset>
+#include <boost/noncopyable.hpp>
 
 // Forward declarations
 namespace gnash {
@@ -126,7 +127,7 @@
 /// There is a *single* instance of this class for each run;
 /// loading external movies will *not* create a new instance of it.
 ///
-class DSOEXPORT movie_root 
+class DSOEXPORT movie_root : boost::noncopyable
 {
 
 public:
@@ -869,12 +870,6 @@
     /// The list of advanceable character, in placement order
     LiveChars _liveChars;
 
-    /// Forbid copy 
-    movie_root(const movie_root& ); 
-
-    /// Forbid assignment
-    movie_root& operator=(const movie_root& );
-
     /// Execute expired timers
     void executeTimers();