[glibmm] Use std::size_t instead of size_t
- From: Murray Cumming <murrayc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Use std::size_t instead of size_t
- Date: Sat, 1 Sep 2012 02:01:44 +0000 (UTC)
commit 71873302bfb5a187f814294d6e75e14660298a6f
Author: Mark Vender <markv743 yahoo co uk>
Date: Thu Aug 2 13:11:44 2012 +0000
Use std::size_t instead of size_t
The C++ standard says that size_t is in the std namespace. Using it as if it was
in the global namespace is implementation-defined behavior.
* glib/src/convert.ccg: Use std::size_t instead of size_t.
* glib/src/convert.hg: Likewise.
* glib/src/thread.hg: Likewise.
* glib/src/threads.hg: Likewise.
* tools/m4/class_opaque_refcounted.m4: Likewise.
glib/src/convert.ccg | 2 +-
glib/src/convert.hg | 2 +-
glib/src/thread.hg | 2 +-
glib/src/threads.hg | 2 +-
tools/m4/class_opaque_refcounted.m4 | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/glib/src/convert.ccg b/glib/src/convert.ccg
index 567ded0..df607a1 100644
--- a/glib/src/convert.ccg
+++ b/glib/src/convert.ccg
@@ -60,7 +60,7 @@ IConv::~IConv()
g_iconv_close(gobject_);
}
-size_t IConv::iconv(char** inbuf, gsize* inbytes_left, char** outbuf, gsize* outbytes_left)
+std::size_t IConv::iconv(char** inbuf, gsize* inbytes_left, char** outbuf, gsize* outbytes_left)
{
return g_iconv(gobject_, inbuf, inbytes_left, outbuf, outbytes_left);
}
diff --git a/glib/src/convert.hg b/glib/src/convert.hg
index 3031604..d0c9fae 100644
--- a/glib/src/convert.hg
+++ b/glib/src/convert.hg
@@ -78,7 +78,7 @@ public:
* @param outbytes_left In/out parameter, bytes available to fill in @a outbuf.
* @return Count of non-reversible conversions, or <tt>static_cast<size_t>(-1)</tt> on error.
*/
- size_t iconv(char** inbuf, gsize* inbytes_left, char** outbuf, gsize* outbytes_left);
+ std::size_t iconv(char** inbuf, gsize* inbytes_left, char** outbuf, gsize* outbytes_left);
_IGNORE(g_iconv)
/** Reset conversion descriptor to initial state.
diff --git a/glib/src/thread.hg b/glib/src/thread.hg
index b1e6c7b..3ba75d8 100644
--- a/glib/src/thread.hg
+++ b/glib/src/thread.hg
@@ -294,7 +294,7 @@ private:
// Glib::Thread can neither be constructed nor deleted.
Thread();
- void operator delete(void*, size_t);
+ void operator delete(void*, std::size_t);
// noncopyable
Thread(const Thread&);
diff --git a/glib/src/threads.hg b/glib/src/threads.hg
index 5b9323c..98174d9 100644
--- a/glib/src/threads.hg
+++ b/glib/src/threads.hg
@@ -117,7 +117,7 @@ private:
// Glib::Thread can neither be constructed nor deleted.
Thread();
- void operator delete(void*, size_t);
+ void operator delete(void*, std::size_t);
// noncopyable
Thread(const Thread&);
diff --git a/tools/m4/class_opaque_refcounted.m4 b/tools/m4/class_opaque_refcounted.m4
index 3d2ebbf..c9242ba 100644
--- a/tools/m4/class_opaque_refcounted.m4
+++ b/tools/m4/class_opaque_refcounted.m4
@@ -169,7 +169,7 @@ ifelse(__OPAQUE_FUNC_NEW,NONE,`dnl
protected:
// Do not derive this. __NAMESPACE__::__CPPNAME__ can neither be constructed nor deleted.
__CPPNAME__`'();
- void operator delete(void*, size_t);
+ void operator delete(void*, std::size_t);
private:
// noncopyable
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]