X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=gobject%2Fgatomicarray.c;h=08af80dca951baa86db369fc711f6a74b420515d;hb=2e5bd8cf47f9e1559ccc44823a2f321b8ff8c1ea;hp=2c2a09cf98712bb0bc5889688f2c6bce50444a3a;hpb=4c55b45162a3a76ca6c1d1c450ea667eeb7bae44;p=platform%2Fupstream%2Fglib.git diff --git a/gobject/gatomicarray.c b/gobject/gatomicarray.c index 2c2a09c..08af80d 100644 --- a/gobject/gatomicarray.c +++ b/gobject/gatomicarray.c @@ -12,17 +12,15 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General - * Public License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place, Suite 330, - * Boston, MA 02111-1307, USA. + * Public License along with this library; if not, see . */ #include "config.h" -#include "gatomicarray.h" - #include +#include "gatomicarray.h" + /* A GAtomicArray is a growable, mutable array of data * generally of the form of a header of a specific size and * then a array of items of a fixed size. @@ -110,6 +108,10 @@ _g_atomic_array_init (GAtomicArray *array) * This means you can use this to grow the * array part and it handles the first element * being added automatically. + * + * We don't support shrinking arrays, as if + * we then re-grow we may reuse an old pointer + * value and confuse the transaction check. */ gpointer _g_atomic_array_copy (GAtomicArray *array, @@ -119,11 +121,6 @@ _g_atomic_array_copy (GAtomicArray *array, guint8 *new, *old; gsize old_size, new_size; - /* We don't support shrinking arrays, as if - we then re-grow we may reuse an old pointer - value and confuse the transaction check. */ - g_assert (additional_element_size >= 0); - G_LOCK (array); old = g_atomic_pointer_get (&array->data); if (old)