From 240a862c452f4c89ff25f8c4128ea7de6390c1de Mon Sep 17 00:00:00 2001 From: Xorg Date: Sun, 5 Jun 2016 11:07:00 +0200 Subject: [PATCH] Fix warnings recog_intel.c:589:22: warning: implicit conversion from enumeration type 'enum _common_codes_t' to different enumeration type 'intel_code_t' (aka 'enum _intel_code_t') recog_amd.c:449:9: warning: implicit conversion from enumeration type 'enum _common_codes_t' to different enumeration type 'amd_code_t' (aka 'enum _amd_code_t') --- libcpuid/recog_amd.c | 2 +- libcpuid/recog_intel.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libcpuid/recog_amd.c b/libcpuid/recog_amd.c index d50ad97..058d0a4 100644 --- a/libcpuid/recog_amd.c +++ b/libcpuid/recog_amd.c @@ -446,7 +446,7 @@ static amd_code_t decode_amd_codename_part1(const char *bs) if (match_pattern(bs, "Z-##")) return FUSION_Z; if (match_pattern(bs, "E#-####") || match_pattern(bs, "A#-####")) return FUSION_EA; - return NO_CODE; + return (amd_code_t) NO_CODE; } static void decode_amd_codename(struct cpu_raw_data_t* raw, struct cpu_id_t* data, struct internal_id_info_t* internal) diff --git a/libcpuid/recog_intel.c b/libcpuid/recog_intel.c index bc1c34b..0d56d18 100644 --- a/libcpuid/recog_intel.c +++ b/libcpuid/recog_intel.c @@ -586,7 +586,7 @@ static void decode_intel_number_of_cores(struct cpu_raw_data_t* raw, static intel_code_t get_brand_code(struct cpu_id_t* data) { - intel_code_t code = NO_CODE; + intel_code_t code = (intel_code_t) NO_CODE; int i, need_matchtable = 1, core_ix_base = 0; const char* bs = data->brand_str; const char* s;