[geany/geany] f1a1d8: Merge pull request #397 from techee/revert

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <lists.ban at herbesfolles.org>
Committer:   Colomban Wendling <lists.ban at herbesfolles.org>
Date:        Tue, 30 Dec 2014 21:50:54 UTC
Commit:      f1a1d8c234eaae51e9ec6987d0d4eccf6b32a980
             https://github.com/geany/geany/commit/f1a1d8c234eaae51e9ec6987d0d4eccf6b32a980

Log Message:
-----------
Merge pull request #397 from techee/revert

Remove useless TM micro-optimization from a profile misread.


Modified Paths:
--------------
    tagmanager/src/tm_tag.c

Modified: tagmanager/src/tm_tag.c
4 lines changed, 1 insertions(+), 3 deletions(-)
===================================================================
@@ -895,9 +895,7 @@ static GPtrArray *merge(GPtrArray *big_array, GPtrArray *small_array,
 				while (i1 <= j1) 
 				{
 					val1 = big_array->pdata[i1];
-					/* we allocated enough space so we are sure we don't need to reallocate
-					 * the array - copy and increment the size directly so it can be inlined */
-					res_array->pdata[res_array->len++] = val1;
+					g_ptr_array_add(res_array, val1);
 					i1++;
 				}
 			}



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).