From 433e16af0fc89cf05e5b6f78526a20f24bcbe6d0 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Sat, 2 Sep 2017 22:41:31 +0800 Subject: Misc - Clean up some MSVC warnings --- src/hir/deserialise.cpp | 2 +- src/hir_expand/vtable.cpp | 2 +- src/mir/optimise.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/hir/deserialise.cpp b/src/hir/deserialise.cpp index 0777a33b..1953828b 100644 --- a/src/hir/deserialise.cpp +++ b/src/hir/deserialise.cpp @@ -1064,7 +1064,7 @@ namespace { }) _(Switch, { deserialise_mir_lvalue(), - deserialise_vec_c([&](){ return m_in.read_count(); }) + deserialise_vec_c([&](){ return static_cast(m_in.read_count()); }) }) _(Call, { static_cast(m_in.read_count()), diff --git a/src/hir_expand/vtable.cpp b/src/hir_expand/vtable.cpp index 12a5f416..45e531b8 100644 --- a/src/hir_expand/vtable.cpp +++ b/src/hir_expand/vtable.cpp @@ -156,7 +156,7 @@ namespace { trait_ptr->m_value_indexes.insert( ::std::make_pair( vi.first, - ::std::make_pair(fields.size(), trait_path.clone()) + ::std::make_pair(static_cast(fields.size()), trait_path.clone()) ) ); DEBUG("- '" << vi.first << "' is @" << fields.size()); fields.push_back( ::std::make_pair( diff --git a/src/mir/optimise.cpp b/src/mir/optimise.cpp index 973aa49f..34a516de 100644 --- a/src/mir/optimise.cpp +++ b/src/mir/optimise.cpp @@ -1942,7 +1942,7 @@ bool MIR_Optimise_ConstPropagte(::MIR::TypeResolve& state, ::MIR::Function& fcn) auto it = known_drop_flags.find(se->other); if( it != known_drop_flags.end() ) { - known_drop_flags.insert(::std::make_pair( se->idx, se->new_val ^ it->second )); + known_drop_flags.insert(::std::make_pair( se->idx, se->new_val != it->second )); } } } -- cgit v1.2.3