Ver código fonte

Fonts: Fix clang compiling warning & error with freetype + lunasvg (#6873, #6842, #6591)

Amend d6360c1
DKing 1 ano atrás
pai
commit
701a047ac0
1 arquivos alterados com 3 adições e 1 exclusões
  1. 3 1
      misc/freetype/imgui_freetype.cpp

+ 3 - 1
misc/freetype/imgui_freetype.cpp

@@ -63,8 +63,10 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wpragmas"                  // warning: unknown option after '#pragma GCC diagnostic' kind
 #pragma GCC diagnostic ignored "-Wunused-function"          // warning: 'xxxx' defined but not used
+#ifndef __clang__
 #pragma GCC diagnostic ignored "-Wsubobject-linkage"        // warning: 'xxxx' has a field 'xxxx' whose type uses the anonymous namespace
 #endif
+#endif
 
 //-------------------------------------------------------------------------
 // Data
@@ -840,7 +842,7 @@ static FT_Error ImGuiLunasvgPortInit(FT_Pointer* _state)
 
 static void ImGuiLunasvgPortFree(FT_Pointer* _state)
 {
-    IM_DELETE(*(LunasvgPortState*)_state);
+    IM_DELETE(*(LunasvgPortState**)_state);
 }
 
 static FT_Error ImGuiLunasvgPortRender(FT_GlyphSlot slot, FT_Pointer* _state)