K-3D / k3d

The main K-3D code repository
http://www.k-3d.org/
GNU General Public License v2.0
200 stars 51 forks source link

[patch] gcc-4.7 #13

Open glixx opened 10 years ago

glixx commented 10 years ago
diff -Naur k3d-source-0.8.0.2.orig/k3dsdk/data.h k3d-source-0.8.0.2/k3dsdk/data.h
--- k3d-source-0.8.0.2.orig/k3dsdk/data.h   2010-07-03 04:27:46.000000000 +0200
+++ k3d-source-0.8.0.2/k3dsdk/data.h    2012-01-05 06:34:18.127223587 +0100
@@ -865,7 +865,7 @@

        try
        {
-           set_value(boost::lexical_cast<value_t>(*new_value), Hint);
+           this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
            return true;
        }
        catch(...)
@@ -1011,7 +1011,7 @@

        try
        {
-           set_value(boost::lexical_cast<value_t>(*new_value), Hint);
+           this->set_value(boost::lexical_cast<value_t>(*new_value), Hint);
            return true;
        }
        catch(...)
@@ -1146,7 +1146,7 @@
        if(!new_value)
            return false;

-       set_value(*new_value, Hint);
+       this->set_value(*new_value, Hint);
        return true;
    }

@@ -1671,7 +1671,7 @@
    /// This little bit of magic makes it possible for base classes (such as node_storage) to update their own values while observing the correct undo policy
    void internal_set_value(const value_t& Value, ihint* const Hint)
    {
-       set_value(Value, Hint);
+       this->set_value(Value, Hint);
    }
 };

diff -Naur k3d-source-0.8.0.2.orig/modules/animation/interpolator.h k3d-source-0.8.0.2/modules/animation/interpolator.h
--- k3d-source-0.8.0.2.orig/modules/animation/interpolator.h    2010-07-03 04:27:55.000000000 +0200
+++ k3d-source-0.8.0.2/modules/animation/interpolator.h 2012-01-05 06:05:38.400985430 +0100
@@ -92,7 +92,7 @@
    {
        time_t t_lower, t_upper;
        value_t v_lower, v_upper;
-       get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); 
+       this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); 
        return lerp(t_lower, t_upper, v_lower, v_upper, Time);
    }
 protected:
@@ -116,7 +116,7 @@
    {
        time_t t_lower, t_upper;
        value_t v_lower, v_upper;
-       get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); 
+       this->get_surrounding_keys(Time, Keyframes, t_lower, t_upper, v_lower, v_upper); 
        return lerp(t_lower, t_upper, v_lower, v_upper, Time);
    } 
 protected:
manuelafm commented 7 years ago

Thanks for the patch, but I think that this issue can be closed, it compiles with recent versions of GCC.