[glibmm/glibmm-2-54] Gio::DataInputStream: Disable deprecation warnings from glib
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm/glibmm-2-54] Gio::DataInputStream: Disable deprecation warnings from glib
- Date: Thu, 15 Feb 2018 14:10:44 +0000 (UTC)
commit 97746f01a83708922eddbb5c834dc0a8d0c91fb6
Author: Kjell Ahlstedt <kjellahlstedt gmail com>
Date: Thu Feb 15 15:08:27 2018 +0100
Gio::DataInputStream: Disable deprecation warnings from glib
g_data_input_stream_read_until(), _read_until_async() and _read_until_finish()
have been deprecated in glib/gio. They can't be deprecated in the stable
glibmm-2-54 branch now. This patch makes it possible to build glibmm-2.54.x
against the newest glib.
gio/src/datainputstream.ccg | 2 ++
gio/src/datainputstream.hg | 7 ++++---
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/gio/src/datainputstream.ccg b/gio/src/datainputstream.ccg
index 7ae9beb..f919720 100644
--- a/gio/src/datainputstream.ccg
+++ b/gio/src/datainputstream.ccg
@@ -93,6 +93,7 @@ DataInputStream::read_line_finish(const Glib::RefPtr<AsyncResult>& result, std::
return retval;
}
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
bool
DataInputStream::read_until(
std::string& data, const std::string& stop_chars, const Glib::RefPtr<Cancellable>& cancellable)
@@ -167,6 +168,7 @@ DataInputStream::read_until_finish(const Glib::RefPtr<AsyncResult>& result, std:
return retval;
}
+G_GNUC_END_IGNORE_DEPRECATIONS
bool
DataInputStream::read_upto(
diff --git a/gio/src/datainputstream.hg b/gio/src/datainputstream.hg
index ad89425..a06b90e 100644
--- a/gio/src/datainputstream.hg
+++ b/gio/src/datainputstream.hg
@@ -138,6 +138,7 @@ public:
*/
_WRAP_METHOD(void read_line_finish_utf8(const Glib::RefPtr<AsyncResult>& result{.}, std::string&
data{OUT}, gsize& length{.?}), g_data_input_stream_read_line_finish_utf8, errthrow)
+ //TODO: This has been really deprecated in glib 2.56.
/** Reads a string from the data input stream, up to the first
* occurrence of any of the stop characters.
*
@@ -158,7 +159,7 @@ public:
bool read_until(std::string& data, const std::string& stop_chars, const Glib::RefPtr<Cancellable>&
cancellable);
_IGNORE(g_data_input_stream_read_until)
- //TODO: This will be really deprecated sometime, maybe sometime after glib 2.30.0.
+ //TODO: This has been really deprecated in glib 2.56.
/** A non-cancellable version of read_until().
*
* Note that, in contrast to read_until_async(),
@@ -176,7 +177,7 @@ public:
*/
bool read_until(std::string& data, const std::string& stop_chars);
- //TODO: This will be really deprecated sometime after glib 2.30.0.
+ //TODO: This has been really deprecated in glib 2.56.
/** The asynchronous version of read_until(). It is
* an error to have two outstanding calls to this function.
*
@@ -197,7 +198,7 @@ public:
void read_until_async(const std::string& stop_chars, const SlotAsyncReady& slot, const
Glib::RefPtr<Cancellable>& cancellable, int io_priority = Glib::PRIORITY_DEFAULT);
_IGNORE(g_data_input_stream_read_until_async)
- //TODO: This will be really deprecated sometime after glib 2.30.0.
+ //TODO: This has been really deprecated in glib 2.56.
/** Finish an asynchronous call started by read_until_async().
*
* @param result The AsyncResult that was provided to the callback slot.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]