[libsigc++2] Use std::size_t and std::ptrdiff_t.
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libsigc++2] Use std::size_t and std::ptrdiff_t.
- Date: Mon, 10 Sep 2012 07:54:37 +0000 (UTC)
commit a6c44b506f2fbc52d48a822aec95517c819143f8
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Mon Sep 10 09:51:07 2012 +0200
Use std::size_t and std::ptrdiff_t.
* sigc++/macros/signal.h.m4: 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>.
* sigc++/signal_base.h: Use std::size_t instead of ::size_t. (I did not change
MSVC++-only code in this file and other files.)
ChangeLog | 10 ++++++++++
sigc++/macros/signal.h.m4 | 32 ++++++++++++++++----------------
sigc++/signal_base.h | 4 ++--
3 files changed, 28 insertions(+), 18 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 638af67..f5cb26e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2012-09-10 Kjell Ahlstedt <kjell ahlstedt bredband net>
+
+ Use std::size_t and std::ptrdiff_t.
+
+ * sigc++/macros/signal.h.m4: 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>.
+ * sigc++/signal_base.h: Use std::size_t instead of ::size_t. (I did not change
+ MSVC++-only code in this file and other files.)
+
2012-09-07 Kjell Ahlstedt <kjell ahlstedt bredband net>
Fix 'make check' with gcc 4.7.
diff --git a/sigc++/macros/signal.h.m4 b/sigc++/macros/signal.h.m4
index 283c165..6d33794 100644
--- a/sigc++/macros/signal.h.m4
+++ b/sigc++/macros/signal.h.m4
@@ -182,7 +182,7 @@ FOR(1, $1,[
typedef std::reverse_iterator<signal_impl::iterator_type> reverse_iterator_type;
#else
typedef std::reverse_iterator<signal_impl::iterator_type, std::random_access_iterator_tag,
- slot_base, slot_base&, slot_base*, ptrdiff_t> reverse_iterator_type;
+ slot_base, slot_base&, slot_base*, std::ptrdiff_t> reverse_iterator_type;
#endif
temp_slot_list slots(impl->slots_);
@@ -260,7 +260,7 @@ FOR(1, $1,[
typedef std::reverse_iterator<signal_impl::iterator_type> reverse_iterator_type;
#else
typedef std::reverse_iterator<signal_impl::iterator_type, std::random_access_iterator_tag,
- slot_base, slot_base&, slot_base*, ptrdiff_t> reverse_iterator_type;
+ slot_base, slot_base&, slot_base*, std::ptrdiff_t> reverse_iterator_type;
#endif
for (reverse_iterator_type it = reverse_iterator_type(slots.end()); it != reverse_iterator_type(slots.begin()); ++it)
{
@@ -538,8 +538,8 @@ namespace sigc {
template <typename T_slot>
struct slot_iterator
{
- typedef size_t size_type;
- typedef ptrdiff_t difference_type;
+ typedef std::size_t size_type;
+ typedef std::ptrdiff_t difference_type;
typedef std::bidirectional_iterator_tag iterator_category;
typedef T_slot slot_type;
@@ -604,8 +604,8 @@ struct slot_iterator
template <typename T_slot>
struct slot_const_iterator
{
- typedef size_t size_type;
- typedef ptrdiff_t difference_type;
+ typedef std::size_t size_type;
+ typedef std::ptrdiff_t difference_type;
typedef std::bidirectional_iterator_tag iterator_category;
typedef T_slot slot_type;
@@ -687,10 +687,10 @@ struct slot_list
typedef std::reverse_iterator<const_iterator> const_reverse_iterator;
#else
typedef std::reverse_iterator<iterator, std::random_access_iterator_tag,
- int, int&, int*, ptrdiff_t> reverse_iterator;
+ int, int&, int*, std::ptrdiff_t> reverse_iterator;
typedef std::reverse_iterator<const_iterator, std::random_access_iterator_tag,
- int, const int&, const int*, ptrdiff_t> const_reverse_iterator;
+ int, const int&, const int*, std::ptrdiff_t> const_reverse_iterator;
#endif /* SIGC_HAVE_SUN_REVERSE_ITERATOR */
@@ -781,8 +781,8 @@ namespace internal {
template <class T_emitter, class T_result = typename T_emitter::result_type>
struct slot_iterator_buf
{
- typedef size_t size_type;
- typedef ptrdiff_t difference_type;
+ typedef std::size_t size_type;
+ typedef std::ptrdiff_t difference_type;
typedef std::bidirectional_iterator_tag iterator_category;
//These are needed just to make this a proper C++ iterator,
@@ -864,8 +864,8 @@ private:
template <class T_emitter>
struct slot_iterator_buf<T_emitter, void>
{
- typedef size_t size_type;
- typedef ptrdiff_t difference_type;
+ typedef std::size_t size_type;
+ typedef std::ptrdiff_t difference_type;
typedef std::bidirectional_iterator_tag iterator_category;
typedef T_emitter emitter_type;
@@ -935,8 +935,8 @@ private:
template <class T_emitter, class T_result = typename T_emitter::result_type>
struct slot_reverse_iterator_buf
{
- typedef size_t size_type;
- typedef ptrdiff_t difference_type;
+ typedef std::size_t size_type;
+ typedef std::ptrdiff_t difference_type;
typedef std::bidirectional_iterator_tag iterator_category;
//These are needed just to make this a proper C++ iterator,
@@ -1020,8 +1020,8 @@ private:
template <class T_emitter>
struct slot_reverse_iterator_buf<T_emitter, void>
{
- typedef size_t size_type;
- typedef ptrdiff_t difference_type;
+ typedef std::size_t size_type;
+ typedef std::ptrdiff_t difference_type;
typedef std::bidirectional_iterator_tag iterator_category;
typedef T_emitter emitter_type;
diff --git a/sigc++/signal_base.h b/sigc++/signal_base.h
index e43bd5e..d16ccfa 100644
--- a/sigc++/signal_base.h
+++ b/sigc++/signal_base.h
@@ -46,7 +46,7 @@ namespace internal
*/
struct SIGC_API signal_impl
{
- typedef size_t size_type;
+ typedef std::size_t size_type;
typedef std::list<slot_base> slot_list;
typedef slot_list::iterator iterator_type;
typedef slot_list::const_iterator const_iterator_type;
@@ -239,7 +239,7 @@ private:
*/
struct SIGC_API signal_base : public trackable
{
- typedef size_t size_type;
+ typedef std::size_t size_type;
signal_base();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]