Skip to content
This repository was archived by the owner on Jun 5, 2019. It is now read-only.

Commit 633fa9a

Browse files
committed
Merge pull request #288 from cw2/issue-257-vs14-warnings
Eliminated VS14 build_sdk warnings
2 parents d6460f4 + d194ed3 commit 633fa9a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CLR/Core/ParseOptions_Win32.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ void CLR_RT_ParseOptions::Usage()
293293

294294
if(m_commands.size() > 1)
295295
{
296-
wprintf( L" %s\n", option.c_str(), cmd->m_szDescription );
296+
wprintf( L" %s\n", option.c_str());
297297
}
298298

299299
for(it2 = cmd->m_params.begin(); it2 != cmd->m_params.end(); it2++)

CLR/Tools/Parser/ByteCodeParser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,8 +386,8 @@ void MetaData::ByteCode::DumpOpcode( size_t index, LogicalOpcodeDesc& ref )
386386
if(ref.m_ol->m_flags & CLR_RT_OpcodeLookup::ATTRIB_HAS_TOKEN) wprintf( L" %08x" , ref.m_token );
387387
if(ref.m_ol->m_flags & CLR_RT_OpcodeLookup::ATTRIB_HAS_I4 ) wprintf( L" %d" , ref.m_arg_I4 );
388388
if(ref.m_ol->m_flags & CLR_RT_OpcodeLookup::ATTRIB_HAS_I8 ) wprintf( L" %I64d" , ref.m_arg_I8 );
389-
if(ref.m_ol->m_flags & CLR_RT_OpcodeLookup::ATTRIB_HAS_R4 ) wprintf( L" %f" , ref.m_arg_R4 );
390-
if(ref.m_ol->m_flags & CLR_RT_OpcodeLookup::ATTRIB_HAS_R8 ) wprintf( L" %g" , ref.m_arg_R8 );
389+
if(ref.m_ol->m_flags & CLR_RT_OpcodeLookup::ATTRIB_HAS_R4 ) wprintf( L" %f" , (float)ref.m_arg_R4 );
390+
if(ref.m_ol->m_flags & CLR_RT_OpcodeLookup::ATTRIB_HAS_R8 ) wprintf( L" %g" , (double)ref.m_arg_R8 );
391391

392392
if(ref.m_ol->m_flags & CLR_RT_OpcodeLookup::ATTRIB_HAS_TARGET)
393393
{

0 commit comments

Comments
 (0)