[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2126-g9323a55

[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  9323a5502dad11f4c17ab3aa91fc2b0ea35b68c3 (commit)
       via  c6e37435e7ac0384dfaba6cb058627514c0b3081 (commit)
      from  55405395c26eb7e9c3e1d3ed7d322075b91dd31f (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=9323a5502dad11f4c17ab3aa91fc2b0ea35b68c3


commit 9323a5502dad11f4c17ab3aa91fc2b0ea35b68c3
Author: Bastiaan Jacques <address@hidden>
Date:   Mon Jun 9 17:45:42 2014 +0200

    Define ButtonRecord's move constructor explicityly, to make GCC 4.7 happy.

diff --git a/libcore/swf/DefineButtonTag.h b/libcore/swf/DefineButtonTag.h
index 3e00a69..ea7164f 100644
--- a/libcore/swf/DefineButtonTag.h
+++ b/libcore/swf/DefineButtonTag.h
@@ -67,6 +67,8 @@ public:
     {
     }
 
+    ButtonRecord(ButtonRecord&&) = default;
+
     /// Create a DisplayObject from a ButtonRecord.
     //
     /// @param name     Whether the created DisplayObject requires its own

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


commit c6e37435e7ac0384dfaba6cb058627514c0b3081
Author: Bastiaan Jacques <address@hidden>
Date:   Mon Jun 9 17:15:32 2014 +0200

    Revert "Tidy up."
    
    This reverts commit 22ce3d1ba4376ce0495701dab0548dc2aff9735e.
    
    22ce3d1ba uses C++ features that are not available in GCC-4.6.

diff --git a/libcore/as_value.h b/libcore/as_value.h
index 04b338e..22ac59a 100644
--- a/libcore/as_value.h
+++ b/libcore/as_value.h
@@ -115,50 +115,63 @@ public:
         DISPLAYOBJECT,
         DISPLAYOBJECT_EXCEPT
     };
-
-    template <typename T>
-    as_value(AsType type, T&& val)
-        : _type(type),
-          _value(std::forward<T>(val))
-    {}
     
     /// Construct an undefined value
     DSOEXPORT as_value()
-        : as_value(UNDEFINED, boost::blank())
-    {}
+        :
+        _type(UNDEFINED),
+        _value(boost::blank())
+    {
+    }
     
     /// Copy constructor.
     DSOEXPORT as_value(const as_value& v)
-        : as_value(v._type, v._value)
-    {}
+        :
+        _type(v._type),
+        _value(v._value)
+    {
+    }
 
     /// Move constructor.
     DSOEXPORT as_value(as_value&& other)
-        : as_value(other._type, std::move(other._value))
+        : _type(other._type),
+          _value(std::move(other._value))
     {
         other._type = UNDEFINED;
     }
 
+    ~as_value() {}
+    
     /// Construct a primitive String value 
     DSOEXPORT as_value(const char* str)
-        : as_value(STRING, std::string(str))
+        :
+        _type(STRING),
+        _value(std::string(str))
     {}
 
     /// Construct a primitive String value 
     DSOEXPORT as_value(std::string str)
-        : as_value(STRING, std::move(str))
+        :
+        _type(STRING),
+        _value(std::move(str))
     {}
     
     /// Construct a primitive Boolean value
     template <typename T>
     as_value(T val, typename std::enable_if<std::is_same<bool, 
T>::value>::type*
-             = 0)
-        : as_value(BOOLEAN, val)
-    {}
+             dummy = 0)
+        :
+        _type(BOOLEAN),
+        _value(val)
+       {
+        UNUSED(dummy);
+       }
     
     /// Construct a primitive Number value
     as_value(double num)
-        : as_value(NUMBER, num)
+        :
+        _type(NUMBER),
+        _value(num)
     {}
     
     /// Construct a null, Object, or DisplayObject value

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

Summary of changes:
 libcore/as_value.h            |   47 ++++++++++++++++++++++++++--------------
 libcore/swf/DefineButtonTag.h |    2 +
 2 files changed, 32 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Gnash