From d5d73d514946ea4a7f5691f46c4d6b9c2776f59d Mon Sep 17 00:00:00 2001
From: Morgan Deters <mdeters@gmail.com>
Date: Sat, 18 Jun 2011 02:44:41 +0000
Subject: Some fixes inspired by Fedora 15: * compilation fixes for GCC 4.6.x  
 + ptrdiff_t is now in std:: * fix some make rules that are ok in Make 3.81
 but broke in Make 3.82 * look for cxxtestgen.py as well as cxxtestgen.pl, and
 look for cxxtest headers in /usr/include

---
 src/expr/node.h       | 2 +-
 src/expr/node_value.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/expr')

diff --git a/src/expr/node.h b/src/expr/node.h
index 372eec8c0..999719592 100644
--- a/src/expr/node.h
+++ b/src/expr/node.h
@@ -612,7 +612,7 @@ public:
 
   public:
     typedef NodeTemplate<ref_count> value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef NodeTemplate<ref_count>* pointer;
     typedef NodeTemplate<ref_count>& reference;
 
diff --git a/src/expr/node_value.h b/src/expr/node_value.h
index 1722bae30..f2da42731 100644
--- a/src/expr/node_value.h
+++ b/src/expr/node_value.h
@@ -152,7 +152,7 @@ private:
   public:
     typedef std::random_access_iterator_tag iterator_category;
     typedef T value_type;
-    typedef ptrdiff_t difference_type;
+    typedef std::ptrdiff_t difference_type;
     typedef T* pointer;
     typedef T& reference;
 
-- 
cgit v1.2.3