Prevent lots of warnings like [_surface.h:68] declaration of 'typedef ...alpha_pen...

[synfig.git] / ETL / trunk / ETL / _surface.h

diff --git a/ETL/trunk/ETL/_surface.h b/ETL/trunk/ETL/_surface.h
index b91ab98..8561970 100644 (file)
--- a/ETL/trunk/ETL/_surface.h
+++ b/ETL/trunk/ETL/_surface.h
@@ -32,6 +32,7 @@
 #include "_pen.h"
 #include "_misc.h"
 #include <algorithm>
+#include <cstring>
 
 /* === M A C R O S ========================================================= */
 
@@ -64,7 +65,7 @@ public:
        typedef VP value_prep_type;
 
        typedef alpha_pen<const_pen> const_alpha_pen;
-       typedef alpha_pen<pen> alpha_pen;
+       typedef alpha_pen<pen> non_const_alpha_pen;
 
        typedef typename pen::difference_type size_type;
        typedef typename pen::difference_type difference_type;
@@ -495,7 +496,7 @@ public:
                if(y0 > y1) std::swap(y0,y1);
 
                //local variable madness
-               //all things that want to interoperate should provide a default value constructor for = 0
+               //all things that want to inter-operate should provide a default value constructor for = 0
                accumulator_type acum = 0;
                int xi=0,yi=0;
 
@@ -561,7 +562,7 @@ public:
                if(y0 > y1) std::swap(y0,y1);
 
                //local variable madness
-               //all things that want to interoperate should provide a default value constructor for = 0
+               //all things that want to inter-operate should provide a default value constructor for = 0
                accumulator_type acum = 0;
                int xi=0,yi=0;