[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2069-g0d10397

[Bastiaan Jacques]

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  0d10397941b88ce0731b0caa3dc23594b93c36df (commit)
      from  1297cb8e17a07c07392758f5a3204d16125287a0 (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=0d10397941b88ce0731b0caa3dc23594b93c36df


commit 0d10397941b88ce0731b0caa3dc23594b93c36df
Author: Bastiaan Jacques <address@hidden>
Date:   Tue May 27 21:35:11 2014 +0200

    Use _canceled also to signify thread exit.

diff --git a/libcore/LoadVariablesThread.cpp b/libcore/LoadVariablesThread.cpp
index 097441a..f01287d 100644
--- a/libcore/LoadVariablesThread.cpp
+++ b/libcore/LoadVariablesThread.cpp
@@ -125,6 +125,7 @@ LoadVariablesThread::completeLoad(IOChannel* varstream,
     }
 
     //dispatchLoadEvent();
+    canceled = true;
 
     return parseResult;
 }
diff --git a/libcore/LoadVariablesThread.h b/libcore/LoadVariablesThread.h
index eead251..a1d6ccc 100644
--- a/libcore/LoadVariablesThread.h
+++ b/libcore/LoadVariablesThread.h
@@ -85,12 +85,7 @@ public:
 
        bool completed()
        {
-#if (__GNUC__ == 4 && __GNUC_MINOR__ <= 6)
-                return _vals.wait_for(std::chrono::seconds(0));
-#else
-                std::future_status status = 
_vals.wait_for(std::chrono::seconds(0));
-                return status == std::future_status::ready;
-#endif
+                return _canceled;
        }
 
 private:
@@ -110,6 +105,9 @@ private:
 
         std::future<ValuesMap> _vals;
 
+       /// Indicates either whether cancellation was requested, or whether the
+       /// thread has finished executing code, from the perspective of the
+       /// variables loading thread thread and the main thread respectively.
        std::atomic<bool> _canceled;
 };
 

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

Summary of changes:
 libcore/LoadVariablesThread.cpp |    1 +
 libcore/LoadVariablesThread.h   |   10 ++++------
 2 files changed, 5 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
Gnash