Merge branch 'develop'

2015-03-20 15:04:59 +02:00
parent 0ab0e6eecc 290fe82a43
commit 8cb2c56556
1 changed files with 1 additions and 1 deletions
--- a/include/boost/smart_ptr/detail/array_allocator.hpp
+++ b/include/boost/smart_ptr/detail/array_allocator.hpp
@ -213,7 +213,7 @@ namespace boost {
            typedef Y* pointer;
            typedef const Y* const_pointer;
            typedef std::size_t size_type;
-            typedef ptrdiff_t difference_type;
+            typedef std::ptrdiff_t difference_type;
            typedef Y& reference;
            typedef const Y& const_reference;