diff options
| author | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2012-09-12 16:49:22 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjell.ahlstedt@bredband.net> | 2012-09-12 16:49:22 +0200 |
| commit | 1c2c94f611071085af02a4d5eea83a0958cd9cff (patch) | |
| tree | 3be416d8c082364a31e73fc82e32f8eb57551fdd /glib/glibmm/ustring.h | |
| parent | e71530f74bbd4f573273f5babe1aae24b4f4bb36 (diff) | |
| download | glibmm-1c2c94f611071085af02a4d5eea83a0958cd9cff.tar.gz | |
Use std::size_t and std::ptrdiff_t.
* glib/glibmm/arrayhandle.h:
* glib/glibmm/containers.h:
* glib/glibmm/listhandle.h:
* glib/glibmm/slisthandle.h:
* glib/glibmm/vectorutils.h: Use std::size_t and std::ptrdiff_t instead
of ::size_t and ::ptrdiff_t. Only the std versions are required to be
declared in <cstddef>.
* examples/network/resolver.cc:
* glib/glibmm/containerhandle_shared.h:
* glib/glibmm/helperlist.h:
* glib/glibmm/main.h:
* glib/glibmm/vectorutils.cc: Use std::size_t instead of ::size_t.
* glib/src/convert.hg: Use std::size_t instead of ::size_t in a comment.
* glib/glibmm/property.cc:
* glib/glibmm/ustring.h: Use std::ptrdiff_t instead of ::ptrdiff_t.
Diffstat (limited to 'glib/glibmm/ustring.h')
| -rw-r--r-- | glib/glibmm/ustring.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/glib/glibmm/ustring.h b/glib/glibmm/ustring.h index 047682df..1780383b 100644 --- a/glib/glibmm/ustring.h +++ b/glib/glibmm/ustring.h @@ -30,7 +30,7 @@ #include <sstream> #include <string> #ifndef GLIBMM_HAVE_STD_ITERATOR_TRAITS -#include <cstddef> /* for ptrdiff_t */ +#include <cstddef> /* for std::ptrdiff_t */ #endif namespace Glib @@ -54,7 +54,7 @@ struct IteratorTraits<T*> { 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; }; @@ -64,7 +64,7 @@ struct IteratorTraits<const T*> { typedef std::random_access_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; }; |