Commit: 11f4b407d4b5b5295cbbef577ec4aac2acf24b49 Author: Alexander Romanov Date: Mon Apr 17 13:41:05 2017 +0300 Branches: master https://developer.blender.org/rB11f4b407d4b5b5295cbbef577ec4aac2acf24b49
Fix build error on Windows introduced in D2425 =================================================================== M source/blender/blenlib/BLI_hash.h =================================================================== diff --git a/source/blender/blenlib/BLI_hash.h b/source/blender/blenlib/BLI_hash.h index 551143f5d72..50c7a7f9f0f 100644 --- a/source/blender/blenlib/BLI_hash.h +++ b/source/blender/blenlib/BLI_hash.h @@ -25,7 +25,7 @@ * \ingroup bli */ -static inline unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky) +BLI_INLINE unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky) { #define rot(x,k) (((x)<<(k)) | ((x)>>(32-(k)))) @@ -48,7 +48,7 @@ static inline unsigned int BLI_hash_int_2d(unsigned int kx, unsigned int ky) #undef rot } -static inline unsigned int BLI_hash_string(const char *str) +BLI_INLINE unsigned int BLI_hash_string(const char *str) { unsigned int i = 0, c; @@ -58,7 +58,7 @@ static inline unsigned int BLI_hash_string(const char *str) return i; } -static inline unsigned int BLI_hash_int(unsigned int k) +BLI_INLINE unsigned int BLI_hash_int(unsigned int k) { return BLI_hash_int_2d(k, 0); } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs