]> git.ipfire.org Git - thirdparty/vala.git/commitdiff
glib-2.0: AsyncQueue.try_pop() and timed_pop() may return null
authorAlexander Kurtz <kurtz.alex@googlemail.com>
Thu, 2 Feb 2012 13:26:04 +0000 (14:26 +0100)
committerLuca Bruno <lucabru@src.gnome.org>
Thu, 2 Feb 2012 14:47:33 +0000 (15:47 +0100)
Fixes bug 669242.

vapi/glib-2.0.vapi

index a428bb1df9a4ec98a845533c92445d3675878a07..9cd49a083e29bb3caa5a7e07c23410a64d27a9a9 100644 (file)
@@ -1968,8 +1968,8 @@ namespace GLib {
                public void push (owned G data);
                public void push_sorted (owned G data, CompareDataFunc<G> func);
                public G pop ();
-               public G try_pop ();
-               public G timed_pop (ref TimeVal end_time);
+               public G? try_pop ();
+               public G? timed_pop (ref TimeVal end_time);
                public int length ();
                public void sort (CompareDataFunc<G> func);
                public void @lock ();
@@ -1979,8 +1979,8 @@ namespace GLib {
                public void push_unlocked (owned G data);
                public void push_sorted_unlocked (owned G data, CompareDataFunc<G> func);
                public G pop_unlocked ();
-               public G try_pop_unlocked ();
-               public G timed_pop_unlocked (ref TimeVal end_time);
+               public G? try_pop_unlocked ();
+               public G? timed_pop_unlocked (ref TimeVal end_time);
                public int length_unlocked ();
                public void sort_unlocked (CompareDataFunc<G> func);
        }