Branch: refs/heads/master
Author: Colomban Wendling <lists.ban(a)herbesfolles.org>
Committer: Colomban Wendling <lists.ban(a)herbesfolles.org>
Date: Tue, 30 Dec 2014 21:50:54 UTC
Commit: f1a1d8c234eaae51e9ec6987d0d4eccf6b32a980
https://github.com/geany/geany/commit/f1a1d8c234eaae51e9ec6987d0d4eccf6b32a…
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).
Branch: refs/heads/master
Author: Jiří Techet <techet(a)gmail.com>
Committer: Jiří Techet <techet(a)gmail.com>
Date: Tue, 30 Dec 2014 16:09:18 UTC
Commit: c131466a0035b0421e40661d50181db1ca8de3f6
https://github.com/geany/geany/commit/c131466a0035b0421e40661d50181db1ca8de…
Log Message:
-----------
Revert "Microoptimization in merge"
This reverts commit cb9e4bbf7446e45365cad2242087f2a766662f20.
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).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Wed, 24 Dec 2014 23:53:03 UTC
Commit: 3b8ea98f00cdacd84217adf049dbb5d10c6057c9
https://github.com/geany/geany/commit/3b8ea98f00cdacd84217adf049dbb5d10c605…
Log Message:
-----------
c: Fix C11 keywords (oops)
List keywords from ISO/IEC 9899:201x N1570 (2011-04-12), not N1425
(2009-11-24).
Modified Paths:
--------------
data/filetypes.c
Modified: data/filetypes.c
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -33,7 +33,7 @@ escapesequence=string_1
[keywords]
# all items must be in one line
-primary=alignof asm auto break case char const continue default do double else enum extern float for goto if inline int long register restrict return short signed sizeof static struct switch typedef union unsigned void volatile while _Align _Bool _Complex _Imaginary _Static_assert _Thread_local FALSE NULL TRUE
+primary=asm auto break case char const continue default do double else enum extern float for goto if inline int long register restrict return short signed sizeof static struct switch typedef union unsigned void volatile while _Alignas _Alignof _Atomic _Bool _Complex _Generic _Imaginary _Noreturn _Static_assert _Thread_local FALSE NULL TRUE
secondary=
# these are the Doxygen keywords
docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).
Branch: refs/heads/master
Author: Colomban Wendling <ban(a)herbesfolles.org>
Committer: Colomban Wendling <ban(a)herbesfolles.org>
Date: Wed, 24 Dec 2014 18:09:47 UTC
Commit: ef6f8a0c6595fba0e267860cac3145e264dca633
https://github.com/geany/geany/commit/ef6f8a0c6595fba0e267860cac3145e264dca…
Log Message:
-----------
c++: Remove non-keyword types from keywords list
Closes #391.
Modified Paths:
--------------
data/filetypes.cpp
Modified: data/filetypes.cpp
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -3,7 +3,7 @@
[keywords]
# all items must be in one line
-primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int int8_t int16_t int32_t int64_t long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected ptrdiff_t public register reinterpret_cast return short signed sizeof size_t static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq
+primary=alignas alignof and and_eq asm auto bitand bitor bool break case catch char char16_t char32_t class compl const const_cast constexpr continue decltype default delete do double dynamic_cast else enum explicit export extern false final float for friend goto if inline int long mutable namespace new noexcept not not_eq nullptr operator or or_eq override private protected public register reinterpret_cast return short signed sizeof static static_assert static_cast struct switch template this thread_local throw true try typedef typeid typename union unsigned using virtual void volatile wchar_t while xor xor_eq
secondary=
# these are the Doxygen keywords
docComment=a addindex addtogroup anchor arg attention author authors b brief bug c callergraph callgraph category cite class code cond copybrief copydetails copydoc copyright date def defgroup deprecated details dir dontinclude dot dotfile e else elseif em endcode endcond enddot endhtmlonly endif endinternal endlatexonly endlink endmanonly endmsc endrtfonly endverbatim endxmlonly enum example exception extends file fn headerfile hideinitializer htmlinclude htmlonly if ifnot image implements include includelineno ingroup interface internal invariant latexonly li line link mainpage manonly memberof msc mscfile n name namespace nosubgrouping note overload p package page par paragraph param post pre private privatesection property protected protectedsection protocol public publicsection ref related relatedalso relates relatesalso remark remarks result return returns retval rtfonly sa section see short showinitializer since skip skipline snippet struct subpage subsection subsubsection tableofcontents test throw throws todo tparam typedef union until var verbatim verbinclude version warning weakgroup xmlonly xrefitem
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).