From e8e314efb256092ac7501166b20bda04046350e7 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Mon, 27 Nov 2017 10:44:36 -0500 Subject: [PATCH] Local aliasing fixes --- 4coder_default_framework.h | 4 ++-- 4ed_file_view.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/4coder_default_framework.h b/4coder_default_framework.h index 6e10209a..7fa7283c 100644 --- a/4coder_default_framework.h +++ b/4coder_default_framework.h @@ -517,8 +517,8 @@ read_config_line(Cpp_Token_Array array, int32_t *i_ptr, char *text){ } for (; i < array.count; ++i){ - Cpp_Token token = read_config_token(array, &i); - if (token.type == CPP_TOKEN_SEMICOLON){ + Cpp_Token skip_token = read_config_token(array, &i); + if (skip_token.type == CPP_TOKEN_SEMICOLON){ break; } } diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp index 6bcf07c2..83d16485 100644 --- a/4ed_file_view.cpp +++ b/4ed_file_view.cpp @@ -3601,7 +3601,7 @@ release_font(System_Functions *system, Models *models, Face_ID font_id, Face_ID if (!font.valid){ Face_ID largest_id = system->font.get_largest_id(); for (replacement_id = 1; replacement_id <= largest_id && replacement_id > 0; ++replacement_id){ - Font_Pointers font = system->font.get_pointers_by_id(replacement_id); + font = system->font.get_pointers_by_id(replacement_id); if (font.valid){ break; }