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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/04/19 19:22:41

Modified files:
        .              : ChangeLog 
        server/parser  : movie_def_impl.cpp 

Log message:
        boost 1.35 changed semantic of default constructor for boost::thread 
class.
        Should fix bug #22915.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6330&r2=1.6331
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_def_impl.cpp?cvsroot=gnash&r1=1.104&r2=1.105

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6330
retrieving revision 1.6331
diff -u -b -r1.6330 -r1.6331
--- ChangeLog   19 Apr 2008 10:06:13 -0000      1.6330
+++ ChangeLog   19 Apr 2008 19:22:39 -0000      1.6331
@@ -1,5 +1,11 @@
 2008-04-19 Sandro Santilli <address@hidden>
 
+       * server/parser/movie_def_impl.cpp (isSelfThread): 
+         boost 1.35 changed semantic of default constructor
+         for boost::thread class.
+
+2008-04-19 Sandro Santilli <address@hidden>
+
        * testsuite/swfdec/Makefile.am: remove files
          in chunks on make clean (too many args to rm!).
 

Index: server/parser/movie_def_impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_def_impl.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -b -r1.104 -r1.105
--- server/parser/movie_def_impl.cpp    17 Apr 2008 10:58:01 -0000      1.104
+++ server/parser/movie_def_impl.cpp    19 Apr 2008 19:22:41 -0000      1.105
@@ -41,6 +41,7 @@
 #include "ControlTag.h"
 #include "sound_definition.h" // for sound_sample
 #include <boost/bind.hpp>
+#include <boost/version.hpp>
 
 #include <iomanip>
 #include <memory>
@@ -110,8 +111,13 @@
        if (!_thread.get()) {
                return false;
        }
+#if BOOST_VERSION < 103500
        boost::thread this_thread;
        return this_thread == *_thread;
+#else
+       return boost::this_thread::get_id() == _thread->get_id();
+#endif
+
 }
 
 // static..