[Bf-blender-cvs] [e58ec740465] master: Cleanup: fix compiler warnings for MSVC
Brecht Van Lommel
noreply at git.blender.org
Fri Sep 4 19:11:16 CEST 2020
Commit: e58ec740465516b08f1eefd82f9c798a54e04749
Author: Brecht Van Lommel
Date: Fri Sep 4 17:01:32 2020 +0200
Branches: master
https://developer.blender.org/rBe58ec740465516b08f1eefd82f9c798a54e04749
Cleanup: fix compiler warnings for MSVC
===================================================================
M source/blender/blenlib/intern/BLI_assert.c
M source/blender/blenlib/intern/math_vector_inline.c
M source/blender/editors/include/UI_interface.h
===================================================================
diff --git a/source/blender/blenlib/intern/BLI_assert.c b/source/blender/blenlib/intern/BLI_assert.c
index dc22d035459..f397cdcd8a9 100644
--- a/source/blender/blenlib/intern/BLI_assert.c
+++ b/source/blender/blenlib/intern/BLI_assert.c
@@ -26,7 +26,7 @@
#include <stdio.h>
#include <stdlib.h>
-void _BLI_assert_print_pos(const char *file, int line, const char *function, const char *id)
+void _BLI_assert_print_pos(const char *file, const int line, const char *function, const char *id)
{
fprintf(stderr, "BLI_assert failed: %s:%d, %s(), at \'%s\'\n", file, line, function, id);
}
diff --git a/source/blender/blenlib/intern/math_vector_inline.c b/source/blender/blenlib/intern/math_vector_inline.c
index d3c975e3249..4af7e79c542 100644
--- a/source/blender/blenlib/intern/math_vector_inline.c
+++ b/source/blender/blenlib/intern/math_vector_inline.c
@@ -1178,7 +1178,7 @@ MINLINE float normalize_v3_v3(float r[3], const float a[3])
return normalize_v3_v3_length(r, a, 1.0f);
}
-MINLINE double normalize_v3_v3_length_db(double r[3], const double a[3], double unit_length)
+MINLINE double normalize_v3_v3_length_db(double r[3], const double a[3], double const unit_length)
{
double d = dot_v3v3_db(a, a);
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index ab5e2fcee6a..af282bde550 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -1581,7 +1581,7 @@ bool UI_search_item_add(uiSearchItems *items,
void *poin,
int iconid,
int state,
- uint8_t name_prefix_offset);
+ const uint8_t name_prefix_offset);
void UI_but_func_search_set(uiBut *but,
uiButSearchCreateFn search_create_fn,
More information about the Bf-blender-cvs
mailing list