(MSVC 2017 UWP) Silence warnings

This commit is contained in:
twinaphex 2019-06-19 21:20:31 +02:00
parent c57aa566e5
commit 897a9a7c1a
5 changed files with 9 additions and 11 deletions

View File

@ -1,4 +1,4 @@
#if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500 && _MSC_VER < 1900)
#if defined(_MSC_VER) && !defined(_XBOX) && (_MSC_VER >= 1500)
#if (_MSC_VER >= 1700)
/* https://support.microsoft.com/en-us/kb/980263 */
#pragma execution_character_set("utf-8")

View File

@ -417,9 +417,9 @@ static int action_right_video_gpu_index(unsigned type, const char *label,
if (list)
{
if (settings->ints.d3d11_gpu_index < list->size - 1)
if (settings->ints.d3d11_gpu_index < (int)(list->size - 1))
settings->ints.d3d11_gpu_index++;
else if (settings->ints.d3d11_gpu_index == list->size - 1)
else if (settings->ints.d3d11_gpu_index == (int)(list->size - 1))
settings->ints.d3d11_gpu_index = 0;
}
@ -433,9 +433,9 @@ static int action_right_video_gpu_index(unsigned type, const char *label,
if (list)
{
if (settings->ints.d3d12_gpu_index < list->size - 1)
if (settings->ints.d3d12_gpu_index < (int)(list->size - 1))
settings->ints.d3d12_gpu_index++;
else if (settings->ints.d3d12_gpu_index == list->size - 1)
else if (settings->ints.d3d12_gpu_index == (int)(list->size - 1))
settings->ints.d3d12_gpu_index = 0;
}

View File

@ -1811,9 +1811,7 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
unsigned horizontal_list_size = 0;
if (!ozone)
{
return generic_menu_iterate(menu, userdata, action);
}
if (ozone->horizontal_list)
horizontal_list_size = ozone->horizontal_list->size;
@ -1835,7 +1833,7 @@ static int ozone_menu_iterate(menu_handle_t *menu, void *userdata, enum menu_act
tag = (uintptr_t)ozone;
new_selection = (ozone->categories_selection_ptr + 1);
if (new_selection >= ozone->system_tab_end + horizontal_list_size + 1)
if (new_selection >= (int)(ozone->system_tab_end + horizontal_list_size + 1))
new_selection = 0;
ozone_sidebar_goto(ozone, new_selection);

View File

@ -438,8 +438,8 @@ void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info,
/* Cursor */
if (!old_list && ozone->cursor_mode)
{
if ( cursor_x >= border_start_x && cursor_x <= border_start_x + entry_width &&
cursor_y >= border_start_y && cursor_y <= border_start_y + button_height)
if ( cursor_x >= border_start_x && (cursor_x <= border_start_x + (int)entry_width) &&
cursor_y >= border_start_y && (cursor_y <= border_start_y + (int)button_height))
{
selection_y = y;
menu_navigation_set_selection(i);

View File

@ -787,7 +787,7 @@ static void setting_get_string_representation_int_gpu_index(rarch_setting_t *set
{
struct string_list *list = video_driver_get_gpu_api_devices(video_context_driver_get_api());
if (list && *setting->value.target.integer < list->size && !string_is_empty(list->elems[*setting->value.target.integer].data))
if (list && (*setting->value.target.integer < (int)list->size) && !string_is_empty(list->elems[*setting->value.target.integer].data))
snprintf(s, len, "%d - %s", *setting->value.target.integer, list->elems[*setting->value.target.integer].data);
else
snprintf(s, len, "%d", *setting->value.target.integer);