From: Vivien Delmon <vivien.delmon@creatis.insa-lyon.fr>
Date: Fri, 22 Apr 2011 13:23:33 +0000 (+0200)
Subject: gcc 4.6 compatibility:
X-Git-Tag: v1.2.0~21
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=7f830a5f374e5111517ac050a361c1a2f9870fd3;p=clitk.git

gcc 4.6 compatibility:

* ptrdiff_t is in the std namespace
---

diff --git a/segmentation/tree.hh b/segmentation/tree.hh
index fa47763..2365cf0 100644
--- a/segmentation/tree.hh
+++ b/segmentation/tree.hh
@@ -90,7 +90,7 @@ class tree {
 
       /// Base class for iterators, only pointers stored, no traversal logic.
 #ifdef __SGI_STL_PORT
-		class iterator_base : public stlport::bidirectional_iterator<T, ptrdiff_t> {
+		class iterator_base : public stlport::bidirectional_iterator<T, std::ptrdiff_t> {
 #else
 		class iterator_base {
 #endif
@@ -99,7 +99,7 @@ class tree {
 				typedef T*                              pointer;
 				typedef T&                              reference;
 				typedef size_t                          size_type;
-				typedef ptrdiff_t                       difference_type;
+				typedef std::ptrdiff_t                       difference_type;
 				typedef std::bidirectional_iterator_tag iterator_category;
 
 				iterator_base();