From 0c25f7d7d7f7d408a64255832760adbfbd82628c Mon Sep 17 00:00:00 2001 From: Richard Kimberly Heck Date: Sun, 19 Apr 2020 11:10:52 -0400 Subject: [PATCH] Fix warning --- src/Trans.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Trans.cpp b/src/Trans.cpp index 8a74b9ab4c..b73b88490e 100644 --- a/src/Trans.cpp +++ b/src/Trans.cpp @@ -98,7 +98,7 @@ TeXAccent get_accent(FuncCode action) ++i; } struct TeXAccent temp = { static_cast(0), 0, - 0, static_cast(0)}; + nullptr, static_cast(0)}; return temp; } @@ -303,7 +303,7 @@ int Trans::load(Lexer & lex) if (!lex.next(true)) return -1; - key_from = lex.getString()[0]; + key_from = static_cast(lex.getString()[0]); LYXERR(Debug::KBMAP, "\t`" << lex.getString() << '\''); if (!lex.next(true)) @@ -433,8 +433,8 @@ tex_accent getkeymod(string const & p) // TransFSMData -TransFSMData::TransFSMData() : deadkey_(0), deadkey2_(0), init_state_(0), - deadkey_state_(0), combined_state_(0), currentState(0) +TransFSMData::TransFSMData() : deadkey_(0), deadkey2_(0), init_state_(nullptr), + deadkey_state_(nullptr), combined_state_(nullptr), currentState(nullptr) { } -- 2.39.5