Commit 79bbbc98 authored by marko's avatar marko

branches/zip: Fix two more bogus MSVC C4090 warnings on constness differences

(Warning C4090 is incorrectly issued when using Visual C++ .NET 2003,
bug 101661, http://connect.microsoft.com/VisualStudio/feedback/ViewFeedback.aspx?FeedbackID=101661)

dict_table_find_equivalent_index(): Cast away constness in the mem_free()
call.  MSVC seems to think that an array of pointers to const data is
const itself.

UT_SORT_FUNCTION_BODY(): Cast away constness in the memcpy() call.
MSVC seems to think that an array of pointers to const data is const itself.
parent d4f5d8a8
...@@ -4484,7 +4484,7 @@ dict_table_find_equivalent_index( ...@@ -4484,7 +4484,7 @@ dict_table_find_equivalent_index(
table, column_names, index->n_fields, table, column_names, index->n_fields,
index, TRUE, FALSE); index, TRUE, FALSE);
mem_free(column_names); mem_free((void*) column_names);
return(equiv_index); return(equiv_index);
} }
......
...@@ -80,7 +80,7 @@ two elements from the array and returns 1, if the first is bigger, ...@@ -80,7 +80,7 @@ two elements from the array and returns 1, if the first is bigger,
}\ }\
}\ }\
\ \
memcpy((ARR) + (LOW), (AUX_ARR) + (LOW),\ memcpy((void*) ((ARR) + (LOW)), (AUX_ARR) + (LOW),\
((HIGH) - (LOW)) * sizeof *(ARR));\ ((HIGH) - (LOW)) * sizeof *(ARR));\
}\ }\
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment