diff options
author | Morgan Deters <mdeters@gmail.com> | 2011-06-18 02:44:41 +0000 |
---|---|---|
committer | Morgan Deters <mdeters@gmail.com> | 2011-06-18 02:44:41 +0000 |
commit | d5d73d514946ea4a7f5691f46c4d6b9c2776f59d (patch) | |
tree | 68654da6eedf2c05681a5f8df1553fd88d179271 /src/context | |
parent | 0555d96193b6d9c39c26a04941c6087e4465adf0 (diff) |
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
Diffstat (limited to 'src/context')
-rw-r--r-- | src/context/cdlist.h | 2 | ||||
-rw-r--r-- | src/context/cdlist_context_memory.h | 2 | ||||
-rw-r--r-- | src/context/context_mm.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/context/cdlist.h b/src/context/cdlist.h index 7edef4121..c999ecadb 100644 --- a/src/context/cdlist.h +++ b/src/context/cdlist.h @@ -320,7 +320,7 @@ public: // requirements of a bidirectional iterator ? typedef std::input_iterator_tag iterator_category; typedef T value_type; - typedef ptrdiff_t difference_type; + typedef std::ptrdiff_t difference_type; typedef const T* pointer; typedef const T& reference; diff --git a/src/context/cdlist_context_memory.h b/src/context/cdlist_context_memory.h index 2fd1ceb8c..45a44756d 100644 --- a/src/context/cdlist_context_memory.h +++ b/src/context/cdlist_context_memory.h @@ -437,7 +437,7 @@ public: typedef std::input_iterator_tag iterator_category; typedef T value_type; - typedef ptrdiff_t difference_type; + typedef std::ptrdiff_t difference_type; typedef const T* pointer; typedef const T& reference; diff --git a/src/context/context_mm.h b/src/context/context_mm.h index 71f7041c7..56ef7ab59 100644 --- a/src/context/context_mm.h +++ b/src/context/context_mm.h @@ -150,7 +150,7 @@ class ContextMemoryAllocator { public: typedef size_t size_type; - typedef ptrdiff_t difference_type; + typedef std::ptrdiff_t difference_type; typedef T* pointer; typedef T const* const_pointer; typedef T& reference; |