Fix strict warnings on Windows
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Dec 2016 15:46:04 +0000 (16:46 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 13 Dec 2016 15:46:04 +0000 (16:46 +0100)
extern/curve_fit_nd/curve_fit_nd.h
source/blender/editors/mesh/editmesh_undo.c
source/blender/makesdna/intern/dna_genfile.c

index cfb1881fe002739ab61f8a721ef1c706d9518b5f..7232f802e288a3d6eec9d02ecaabc70c4c7ce830 100644 (file)
@@ -137,7 +137,7 @@ int curve_fit_cubic_to_points_refit_db(
         const double          error_threshold,
         const unsigned int    calc_flag,
         const unsigned int   *corners,
-        unsigned int          corners_len,
+        const unsigned int    corners_len,
         const double          corner_angle,
 
         double **r_cubic_array, unsigned int *r_cubic_array_len,
index c9814d189a416612bb617b43e81d0e196dc71cb0..534ca22178eabfd1c9a5b6284d9395bb51fdde65 100644 (file)
@@ -369,7 +369,9 @@ struct UMArrayData {
        UndoMesh *um;
        const UndoMesh *um_ref;  /* can be NULL */
 };
-static void um_arraystore_compact_cb(TaskPool *UNUSED(pool), void *taskdata, int UNUSED(threadid))
+static void um_arraystore_compact_cb(TaskPool *__restrict UNUSED(pool),
+                                     void *taskdata,
+                                     int UNUSED(threadid))
 {
        struct UMArrayData *um_data = taskdata;
        um_arraystore_compact_with_info(um_data->um, um_data->um_ref);
index 96085a79eff6c21b9eddd30aee3df0dd6b9f3f2a..181d01e04fc8580eeb1d6aa94fdd815983ed7a22 100644 (file)
@@ -169,7 +169,7 @@ void DNA_sdna_free(SDNA *sdna)
        }
 
        MEM_freeN((void *)sdna->names);
-       MEM_freeN(sdna->types);
+       MEM_freeN((void *)sdna->types);
        MEM_freeN(sdna->structs);
 
 #ifdef WITH_DNA_GHASH