From 2f5b2dd6bb2db2464d9b9c9d95fc0a57559fa331 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sat, 22 Sep 2018 20:51:25 -0700 Subject: Reworked message formatting --- Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'Graphics/HLSL2GLSLConverterLib') diff --git a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp index 6eaa5497..bd032a06 100644 --- a/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp +++ b/Graphics/HLSL2GLSLConverterLib/src/HLSL2GLSLConverterImpl.cpp @@ -916,11 +916,10 @@ String HLSL2GLSLConverterImpl::ConversionStream::PrintTokenContext( IteratorType #define VERIFY_PARSER_STATE( Token, Condition, ... )\ - if( !(Condition) ) \ - { \ - MsgStream ss; \ - FormatMsg( ss, __VA_ARGS__ ); \ - LOG_ERROR_AND_THROW( ss.str(), "\n", PrintTokenContext(Token, 4) );\ + if( !(Condition) ) \ + { \ + auto err = FormatString(__VA_ARGS__ ); \ + LOG_ERROR_AND_THROW( err, "\n", PrintTokenContext(Token, 4) );\ } template -- cgit v1.2.3