Fix more issues with modern compilers.

inducer · Feb 10, 2008 · 5ed5df5 · 5ed5df5
1 parent 84e96ee
commit 5ed5df5
Show file tree

Hide file tree

Showing 6 changed files with 105 additions and 86 deletions.
diff --git a/src/ixlib_array.hpp b/src/ixlib_array.hpp
@@ -231,17 +231,17 @@ namespace ixion {
         : super(source)
         { source.invalidate(); }
       virtual ~auto_array()
-        { internal_deallocate(); }
+        { this->internal_deallocate(); }
 
       auto_array &operator=(auto_array &source) {
-        internal_deallocate();
+        this->internal_deallocate();
         super::operator=(source);
         source.invalidate();
         return *this;
         }
 
       virtual void allocate(typename super::size_type cap) {
-        internal_deallocate();
+        this->internal_deallocate();
         super::allocate(cap);
         }
   };
@@ -269,25 +269,25 @@ namespace ixion {
       : super(source)
       { source.invalidate(); }
     virtual ~auto_destroy_array() { 
-      internal_destroy();
-      internal_deallocate(); 
+      this->internal_destroy();
+      this->internal_deallocate(); 
       }
 
     auto_destroy_array &operator=(auto_destroy_array &source) {
-      internal_destroy();
-      internal_deallocate();
+      this->internal_destroy();
+      this->internal_deallocate();
       super::operator=(source);
       source.invalidate();
       return *this;
       }
 
     virtual void allocate(typename super::size_type cap) {
-      internal_destroy();
-      internal_deallocate();
+      this->internal_destroy();
+      this->internal_deallocate();
       super::allocate(cap);
       }
     virtual void deallocate() {
-      internal_destroy();
+      this->internal_destroy();
       super::deallocate();
       }
     };

diff --git a/src/ixlib_drawing_functions.hpp b/src/ixlib_drawing_functions.hpp
@@ -437,7 +437,7 @@ void ixion::drawing_functions::fillEllipse(Target &target,int x,int y,int r_x,in
 
 template<class Target,class T>
 void ixion::drawing_functions::drawPolygon(Target &target,polygon<T> const &poly) {
-  FOREACH_CONST(first_seg,poly,polygon<T>) {
+  FOREACH_CONST(first_seg,poly,typename polygon<T>) {
     if ((*first_seg)->size() <= 1) continue;
     if ((*first_seg)->size() == 2) {
       drawLine(target,(*first_seg)->front()[0],(*first_seg)->front()[1],
@@ -446,7 +446,7 @@ void ixion::drawing_functions::drawPolygon(Target &target,polygon<T> const &poly
       }
 
     // at least a triangle
-    polygon_segment<T>::const_iterator 
+    typename polygon_segment<T>::const_iterator 
       next = (*first_seg)->begin(),
       last = (*first_seg)->end(),
       previous = last-1;

diff --git a/src/ixlib_geometry.hpp b/src/ixlib_geometry.hpp
@@ -13,6 +13,7 @@
 
 
 
+#include <cmath>
 #include <vector>
 #include <ixlib_base.hpp>
 #include <ixlib_exgen.hpp>

diff --git a/src/ixlib_polygon.hpp b/src/ixlib_polygon.hpp
@@ -40,7 +40,7 @@ namespace ixion {
         }
 
       void push_back_c(T x,T y);
-      void insert_c(super::iterator it,T x,T y);
+      void insert_c(typename super::iterator it,T x,T y);
 
       bool isPointInside(T x,T y);
 
@@ -64,7 +64,7 @@ namespace ixion {
       typedef std::vector<polygon_segment<T> *>      super;
 
     public:
-      typedef polygon_segment<T>::vertex_2d	vertex_2d;
+      typedef typename polygon_segment<T>::vertex_2d	vertex_2d;
 
     public:
       polygon() {