diff options
| author | John Hodge <tpg@mutabah.net> | 2017-09-02 22:41:31 +0800 |
|---|---|---|
| committer | John Hodge <tpg@mutabah.net> | 2017-09-02 22:41:31 +0800 |
| commit | 433e16af0fc89cf05e5b6f78526a20f24bcbe6d0 (patch) | |
| tree | 25a742bee2897c5495b542256366dc4c5b1b1142 | |
| parent | f2cd7ef8802da4115a39f92ee89630e5b012f754 (diff) | |
| download | mrust-433e16af0fc89cf05e5b6f78526a20f24bcbe6d0.tar.gz | |
Misc - Clean up some MSVC warnings
| -rw-r--r-- | src/hir/deserialise.cpp | 2 | ||||
| -rw-r--r-- | src/hir_expand/vtable.cpp | 2 | ||||
| -rw-r--r-- | src/mir/optimise.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
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<unsigned int>([&](){ return m_in.read_count(); }) + deserialise_vec_c<unsigned int>([&](){ return static_cast<unsigned int>(m_in.read_count()); }) }) _(Call, { static_cast<unsigned int>(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<unsigned int>(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 )); } } } |