From 2a9ea9e5343ed5ff8f2e31424fd13b22b010c9e9 Mon Sep 17 00:00:00 2001 From: Anthony Nicholls Date: Fri, 21 Jul 2023 14:19:15 +0100 Subject: [PATCH] Warnings: Reformat and match projucer and cmake recommended warnings --- extras/Build/CMake/JUCEHelperTargets.cmake | 67 ++++++++++++++----- .../ProjectSaving/jucer_ProjectExporter.cpp | 36 +++++++--- .../juce_audio_plugin_client_AAX.cpp | 4 +- .../juce_audio_plugin_client_AAX_utils.cpp | 5 +- 4 files changed, 85 insertions(+), 27 deletions(-) diff --git a/extras/Build/CMake/JUCEHelperTargets.cmake b/extras/Build/CMake/JUCEHelperTargets.cmake index 938a527e72..16d6ff1dab 100644 --- a/extras/Build/CMake/JUCEHelperTargets.cmake +++ b/extras/Build/CMake/JUCEHelperTargets.cmake @@ -41,28 +41,63 @@ if((CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") OR (CMAKE_CXX_COMPILER_FRONTEND_VARIA target_compile_options(juce_recommended_warning_flags INTERFACE "/W4") elseif((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") OR (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")) target_compile_options(juce_recommended_warning_flags INTERFACE - -Wall -Wshadow-all -Wshorten-64-to-32 -Wstrict-aliasing - -Wuninitialized -Wunused-parameter -Wconversion -Wsign-compare - -Wint-conversion -Wconditional-uninitialized -Wconstant-conversion - -Wsign-conversion -Wbool-conversion -Wextra-semi -Wunreachable-code - -Wcast-align -Wshift-sign-overflow -Wmissing-prototypes - -Wnullable-to-nonnull-conversion -Wno-ignored-qualifiers -Wswitch-enum - -Wpedantic -Wdeprecated -Wfloat-equal + -Wall + -Wshadow-all + -Wshorten-64-to-32 + -Wstrict-aliasing + -Wuninitialized + -Wunused-parameter + -Wconversion + -Wsign-compare + -Wint-conversion + -Wconditional-uninitialized + -Wconstant-conversion + -Wsign-conversion + -Wbool-conversion + -Wextra-semi + -Wunreachable-code + -Wcast-align + -Wshift-sign-overflow + -Wmissing-prototypes + -Wnullable-to-nonnull-conversion + -Wno-ignored-qualifiers + -Wswitch-enum + -Wpedantic + -Wdeprecated + -Wfloat-equal $<$,$>: - -Wzero-as-null-pointer-constant -Wunused-private-field - -Woverloaded-virtual -Wreorder + -Wzero-as-null-pointer-constant + -Wunused-private-field + -Woverloaded-virtual + -Wreorder -Winconsistent-missing-destructor-override> $<$,$>: - -Wunguarded-availability -Wunguarded-availability-new>) + -Wunguarded-availability + -Wunguarded-availability-new>) elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") target_compile_options(juce_recommended_warning_flags INTERFACE - -Wall -Wextra -Wpedantic -Wstrict-aliasing -Wuninitialized - -Wunused-parameter -Wsign-compare -Wsign-conversion -Wunreachable-code - -Wcast-align -Wno-implicit-fallthrough -Wno-maybe-uninitialized - -Wno-ignored-qualifiers -Wswitch-enum - -Wredundant-decls -Wno-strict-overflow -Wshadow -Wfloat-equal + -Wall + -Wextra + -Wpedantic + -Wstrict-aliasing + -Wuninitialized + -Wunused-parameter + -Wsign-compare + -Wsign-conversion + -Wunreachable-code + -Wcast-align + -Wno-implicit-fallthrough + -Wno-maybe-uninitialized + -Wno-ignored-qualifiers + -Wswitch-enum + -Wredundant-decls + -Wno-strict-overflow + -Wshadow + -Wfloat-equal $<$: - -Woverloaded-virtual -Wreorder -Wzero-as-null-pointer-constant>) + -Woverloaded-virtual + -Wreorder + -Wzero-as-null-pointer-constant>) endif() # ================================================================================================== diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp index 0ea916b194..5b7080ef94 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExporter.cpp @@ -922,17 +922,35 @@ ProjectExporter::BuildConfiguration::BuildConfiguration (Project& p, const Value configLinkerFlagsValue (config, Ids::extraLinkerFlags, getUndoManager()) { auto& llvmFlags = recommendedCompilerWarningFlags[CompilerNames::llvm] = BuildConfiguration::CompilerWarningFlags::getRecommendedForGCCAndLLVM(); - llvmFlags.common.addArray ({ "-Wshorten-64-to-32", "-Wconversion", "-Wint-conversion", - "-Wconditional-uninitialized", "-Wconstant-conversion", "-Wbool-conversion", - "-Wextra-semi", "-Wshift-sign-overflow", - "-Wshadow-all", "-Wnullable-to-nonnull-conversion", - "-Wmissing-prototypes" }); - llvmFlags.cpp.addArray ({ "-Wunused-private-field", "-Winconsistent-missing-destructor-override" }); - llvmFlags.objc.addArray ({ "-Wunguarded-availability", "-Wunguarded-availability-new" }); + + llvmFlags.common.addArray ({ "-Wshadow-all", + "-Wshorten-64-to-32", + "-Wconversion", + "-Wint-conversion", + "-Wconditional-uninitialized", + "-Wconstant-conversion", + "-Wbool-conversion", + "-Wextra-semi", + "-Wshift-sign-overflow", + "-Wmissing-prototypes", + "-Wnullable-to-nonnull-conversion", + "-Wpedantic", + "-Wdeprecated" }); + + llvmFlags.cpp.addArray ({ "-Wunused-private-field", + "-Winconsistent-missing-destructor-override" }); + + llvmFlags.objc.addArray ({ "-Wunguarded-availability", + "-Wunguarded-availability-new" }); auto& gccFlags = recommendedCompilerWarningFlags[CompilerNames::gcc] = BuildConfiguration::CompilerWarningFlags::getRecommendedForGCCAndLLVM(); - gccFlags.common.addArray ({ "-Wextra", "-Wsign-compare", "-Wno-implicit-fallthrough", "-Wno-maybe-uninitialized", - "-Wredundant-decls", "-Wno-strict-overflow", "-Wshadow" }); + gccFlags.common.addArray ({ "-Wextra", + "-Wsign-compare", + "-Wno-implicit-fallthrough", + "-Wno-maybe-uninitialized", + "-Wredundant-decls", + "-Wno-strict-overflow", + "-Wshadow" }); } String ProjectExporter::BuildConfiguration::getGCCOptimisationFlag() const diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp index 1b0140877b..55cf1dbcf4 100644 --- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp +++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX.cpp @@ -45,7 +45,9 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations", "-Wshift-sign-overflow", "-Wsign-conversion", "-Wtautological-overlap-compare", - "-Wzero-as-null-pointer-constant") + "-Wzero-as-null-pointer-constant", + "-Wdeprecated-copy-with-user-provided-dtor", + "-Wdeprecated") #include diff --git a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX_utils.cpp b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX_utils.cpp index 0db3c76e5a..cea4daf7d9 100644 --- a/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX_utils.cpp +++ b/modules/juce_audio_plugin_client/juce_audio_plugin_client_AAX_utils.cpp @@ -46,7 +46,10 @@ JUCE_BEGIN_IGNORE_WARNINGS_GCC_LIKE ("-Wdeprecated-declarations", "-Winconsistent-missing-destructor-override", "-Wshift-sign-overflow", "-Wunused-parameter", - "-Wzero-as-null-pointer-constant") + "-Wzero-as-null-pointer-constant", + "-Wfour-char-constants", + "-Wdeprecated-copy-with-user-provided-dtor", + "-Wdeprecated") JUCE_BEGIN_IGNORE_WARNINGS_MSVC (6001 6053 4996 5033 4068 4996) #include