[LyX/2.3.x] Fix a comparison of arrays to compare *contents*

Scott Kostyshak skostysh at lyx.org
Thu Aug 17 10:40:59 UTC 2023


commit 79507c98af1758f4edb5e3bf6f760fce003816b1
Author: Scott Kostyshak <scott.kostyshak at gmail.com>
Date:   Thu Dec 31 13:15:14 2020 -0500

    Fix a comparison of arrays to compare *contents*
    
    The previous code was mistakenly comparing addresses of the arrays.
    This issue was caught by a warning when compiling with Clang in
    C++20 mode, since comparing array addresses in this way is
    deprecated.
    
    This commit should prevent some unnecessary dispatches of
    LFUN_SCREEN_FONT_UPDATE.
    
    (cherry picked from commit eaebe404ae6c8305161bd5f41496f36cf6a2ab78)
---
 src/LyXRC.cpp |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index 0753534..96a1c09 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -3074,7 +3074,8 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC const & lyxrc_new)
 		|| lyxrc_orig.roman_font_foundry != lyxrc_new.roman_font_foundry
 		|| lyxrc_orig.sans_font_foundry != lyxrc_new.sans_font_foundry
 		|| lyxrc_orig.use_scalable_fonts != lyxrc_new.use_scalable_fonts
-		|| lyxrc_orig.font_sizes != lyxrc_new.font_sizes
+		|| !std::equal(std::begin(lyxrc_orig.font_sizes), std::end(lyxrc_orig.font_sizes),
+			       std::begin(lyxrc_new.font_sizes))
 		|| lyxrc_orig.typewriter_font_foundry != lyxrc_new.typewriter_font_foundry
 		|| lyxrc_orig.defaultZoom != lyxrc_new.defaultZoom) {
 		dispatch(FuncRequest(LFUN_SCREEN_FONT_UPDATE));


More information about the lyx-cvs mailing list