[Bf-blender-cvs] [0d1484e] master: Make function definition consistent with function declaration (as discussed with campbell)

gaiaclary noreply at git.blender.org
Fri Aug 1 14:32:35 CEST 2014


Commit: 0d1484e4ad4766c063e86b85e16df975f5e72baa
Author: gaiaclary
Date:   Fri Aug 1 14:31:41 2014 +0200
Branches: master
https://developer.blender.org/rB0d1484e4ad4766c063e86b85e16df975f5e72baa

Make function definition consistent with function declaration (as discussed with campbell)

===================================================================

M	source/blender/blenlib/intern/string.c

===================================================================

diff --git a/source/blender/blenlib/intern/string.c b/source/blender/blenlib/intern/string.c
index aa705aa..eeafc1a 100644
--- a/source/blender/blenlib/intern/string.c
+++ b/source/blender/blenlib/intern/string.c
@@ -648,7 +648,7 @@ int BLI_str_rstrip_float_zero(char *str, const char pad)
  * \param str_array_len The length of the array, or -1 for a NULL-terminated array.
  * \return The index of str in str_array or -1.
  */
-int BLI_str_index_in_array_n(const char *str, const char **str_array, const int str_array_len)
+int BLI_str_index_in_array_n(const char *__restrict str, const char **__restrict str_array, const int str_array_len)
 {
 	int index;
 	const char **str_iter = str_array;
@@ -668,7 +668,7 @@ int BLI_str_index_in_array_n(const char *str, const char **str_array, const int
  * \param str_array Array of strings, (must be NULL-terminated).
  * \return The index of str in str_array or -1.
  */
-int BLI_str_index_in_array(const char *str, const char **str_array)
+int BLI_str_index_in_array(const char *__restrict str, const char **__restrict str_array)
 {
 	int index;
 	const char **str_iter = str_array;




More information about the Bf-blender-cvs mailing list