and gcc too, because why should its documentation be clear and accurate?

CleverRaven · Sep 19, 2024 · eacf3d8 · eacf3d8
1 parent 2452e49
commit eacf3d8
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/src/main_menu.cpp b/src/main_menu.cpp
@@ -75,10 +75,12 @@ class demo_ui : public cataimgui::window
 
 demo_ui::demo_ui() : cataimgui::window( _( "ImGui Demo Screen" ) )
 {
+    // NOLINTBEGIN(cata-text-style)
     // char *text = "Some long text that will wrap around nicely. </color><color_green><color_red>Some red text in the </color>middle.</color> Some long text that will <color_light_blue_yellow>wrap around nicely.";
     std::string text =
         "Some long text that will wrap around nicely. <color_red>Some red text in the middle.</color> Some long text that will wrap around nicely.";
-    stuff = std::shared_ptr<cataimgui::Paragraph>( new cataimgui::Paragraph() );
+    // NOLINTEND(cata-text-style)
+    stuff = std::make_shared<cataimgui::Paragraph>();
     stuff->append_colored_text( text, c_white );
 }
 

diff --git a/src/third-party/imgui/imgui.h b/src/third-party/imgui/imgui.h
@@ -49,7 +49,7 @@ Index of this file:
 #pragma once
 // NOLINTBEGIN
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Werror=old-style-cast"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 
 // Configuration file with compile-time options
 // (edit imconfig.h or '#define IMGUI_USER_CONFIG "myfilename.h" from your build system')

diff --git a/src/third-party/imgui/imgui_internal.h b/src/third-party/imgui/imgui_internal.h
@@ -44,7 +44,7 @@ Index of this file:
 #pragma once
 // NOLINTBEGIN
 #pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Werror=old-style-cast"
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 
 #ifndef IMGUI_DISABLE