From 86d3ac031d7685e4e2c8f286fd695d743880e487 Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Thu, 11 May 2023 09:38:59 -0700 Subject: [PATCH 1/2] Apply fixes from clag-tidy `misc-unused-parameters` Summary: Gets the project clean of `-Wunused-parameter`, part of `-Wextra`. Enforced as part of the build now. Differential Revision: https://internalfb.com/D45772554 fbshipit-source-id: e7ec6f4047b3994c3615a4557ffc4f3677f9c1e6 --- java/jni/YGJNIVanilla.cpp | 153 +++++++++++++++------------- tests/YGAlignBaselineTest.cpp | 24 ++--- tests/YGAspectRatioTest.cpp | 2 +- tests/YGBaselineFuncTest.cpp | 5 +- tests/YGLoggerTest.cpp | 6 +- tests/YGMeasureCacheTest.cpp | 8 +- tests/YGMeasureTest.cpp | 40 ++++---- tests/YGRoundingFunctionTest.cpp | 10 +- tests/YGRoundingMeasureFuncTest.cpp | 18 ++-- 9 files changed, 139 insertions(+), 127 deletions(-) diff --git a/java/jni/YGJNIVanilla.cpp b/java/jni/YGJNIVanilla.cpp index c4dedb852d..5b7940b8f9 100644 --- a/java/jni/YGJNIVanilla.cpp +++ b/java/jni/YGJNIVanilla.cpp @@ -35,11 +35,14 @@ static inline YGConfigRef _jlong2YGConfigRef(jlong addr) { return reinterpret_cast(static_cast(addr)); } -static jlong jni_YGConfigNewJNI(JNIEnv* env, jobject obj) { +static jlong jni_YGConfigNewJNI(JNIEnv* /*env*/, jobject /*obj*/) { return reinterpret_cast(YGConfigNew()); } -static void jni_YGConfigFreeJNI(JNIEnv* env, jobject obj, jlong nativePointer) { +static void jni_YGConfigFreeJNI( + JNIEnv* /*env*/, + jobject /*obj*/, + jlong nativePointer) { const YGConfigRef config = _jlong2YGConfigRef(nativePointer); // unique_ptr will destruct the underlying global_ref, if present. auto context = std::unique_ptr>{ @@ -48,8 +51,8 @@ static void jni_YGConfigFreeJNI(JNIEnv* env, jobject obj, jlong nativePointer) { } static void jni_YGConfigSetExperimentalFeatureEnabledJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint feature, jboolean enabled) { @@ -59,8 +62,8 @@ static void jni_YGConfigSetExperimentalFeatureEnabledJNI( } static void jni_YGConfigSetUseWebDefaultsJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jboolean useWebDefaults) { const YGConfigRef config = _jlong2YGConfigRef(nativePointer); @@ -68,8 +71,8 @@ static void jni_YGConfigSetUseWebDefaultsJNI( } static void jni_YGConfigSetPrintTreeFlagJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jboolean enable) { const YGConfigRef config = _jlong2YGConfigRef(nativePointer); @@ -77,8 +80,8 @@ static void jni_YGConfigSetPrintTreeFlagJNI( } static void jni_YGConfigSetPointScaleFactorJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jfloat pixelsInPoint) { const YGConfigRef config = _jlong2YGConfigRef(nativePointer); @@ -86,8 +89,8 @@ static void jni_YGConfigSetPointScaleFactorJNI( } static void jni_YGConfigSetUseLegacyStretchBehaviourJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jboolean useLegacyStretchBehaviour) { const YGConfigRef config = _jlong2YGConfigRef(nativePointer); @@ -98,8 +101,8 @@ static void jni_YGConfigSetUseLegacyStretchBehaviourJNI( } static void jni_YGConfigSetErrataJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint errata) { const YGConfigRef config = _jlong2YGConfigRef(nativePointer); @@ -107,22 +110,22 @@ static void jni_YGConfigSetErrataJNI( } static jint jni_YGConfigGetErrataJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer) { const YGConfigRef config = _jlong2YGConfigRef(nativePointer); return static_cast(YGConfigGetErrata(config)); } -static jlong jni_YGNodeNewJNI(JNIEnv* env, jobject obj) { +static jlong jni_YGNodeNewJNI(JNIEnv* /*env*/, jobject /*obj*/) { const YGNodeRef node = YGNodeNew(); YGNodeSetContext(node, YGNodeContext{}.asVoidPtr); return reinterpret_cast(node); } static jlong jni_YGNodeNewWithConfigJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong configPointer) { const YGNodeRef node = YGNodeNewWithConfig(_jlong2YGConfigRef(configPointer)); YGNodeSetContext(node, YGNodeContext{}.asVoidPtr); @@ -131,9 +134,9 @@ static jlong jni_YGNodeNewWithConfigJNI( static int YGJNILogFunc( const YGConfigRef config, - const YGNodeRef node, + const YGNodeRef /*node*/, YGLogLevel level, - void* layoutContext, + void* /*layoutContext*/, const char* format, va_list args) { int result = vsnprintf(NULL, 0, format, args); @@ -175,7 +178,7 @@ static int YGJNILogFunc( static void jni_YGConfigSetLoggerJNI( JNIEnv* env, - jobject obj, + jobject /*obj*/, jlong nativePointer, jobject logger) { const YGConfigRef config = _jlong2YGConfigRef(nativePointer); @@ -200,8 +203,8 @@ static void jni_YGConfigSetLoggerJNI( } static void jni_YGNodeDeallocateJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer) { if (nativePointer == 0) { return; @@ -210,7 +213,10 @@ static void jni_YGNodeDeallocateJNI( YGNodeFree(node); } -static void jni_YGNodeResetJNI(JNIEnv* env, jobject obj, jlong nativePointer) { +static void jni_YGNodeResetJNI( + JNIEnv* /*env*/, + jobject /*obj*/, + jlong nativePointer) { const YGNodeRef node = _jlong2YGNodeRef(nativePointer); void* context = YGNodeGetContext(node); YGNodeReset(node); @@ -218,8 +224,8 @@ static void jni_YGNodeResetJNI(JNIEnv* env, jobject obj, jlong nativePointer) { } static void jni_YGNodeInsertChildJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jlong childPointer, jint index) { @@ -228,8 +234,8 @@ static void jni_YGNodeInsertChildJNI( } static void jni_YGNodeSwapChildJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jlong childPointer, jint index) { @@ -238,8 +244,8 @@ static void jni_YGNodeSwapChildJNI( } static void jni_YGNodeSetIsReferenceBaselineJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jboolean isReferenceBaseline) { YGNodeSetIsReferenceBaseline( @@ -247,23 +253,23 @@ static void jni_YGNodeSetIsReferenceBaselineJNI( } static jboolean jni_YGNodeIsReferenceBaselineJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer) { return YGNodeIsReferenceBaseline(_jlong2YGNodeRef(nativePointer)); } static void jni_YGNodeRemoveAllChildrenJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer) { const YGNodeRef node = _jlong2YGNodeRef(nativePointer); YGNodeRemoveAllChildren(node); } static void jni_YGNodeRemoveChildJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jlong childPointer) { YGNodeRemoveChild( @@ -389,29 +395,29 @@ static void jni_YGNodeCalculateLayoutJNI( } static void jni_YGNodeMarkDirtyJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer) { YGNodeMarkDirty(_jlong2YGNodeRef(nativePointer)); } static void jni_YGNodeMarkDirtyAndPropagateToDescendantsJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer) { YGNodeMarkDirtyAndPropagateToDescendants(_jlong2YGNodeRef(nativePointer)); } static jboolean jni_YGNodeIsDirtyJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer) { return (jboolean) YGNodeIsDirty(_jlong2YGNodeRef(nativePointer)); } static void jni_YGNodeCopyStyleJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong dstNativePointer, jlong srcNativePointer) { YGNodeCopyStyle( @@ -512,8 +518,8 @@ YG_NODE_JNI_STYLE_UNIT_PROP(MaxHeight); YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(Position); static jlong jni_YGNodeStyleGetMarginJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge) { YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer); @@ -525,8 +531,8 @@ static jlong jni_YGNodeStyleGetMarginJNI( } static void jni_YGNodeStyleSetMarginJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge, jfloat margin) { @@ -537,8 +543,8 @@ static void jni_YGNodeStyleSetMarginJNI( } static void jni_YGNodeStyleSetMarginPercentJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge, jfloat percent) { @@ -549,8 +555,8 @@ static void jni_YGNodeStyleSetMarginPercentJNI( } static void jni_YGNodeStyleSetMarginAutoJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge) { YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer); @@ -559,8 +565,8 @@ static void jni_YGNodeStyleSetMarginAutoJNI( } static jlong jni_YGNodeStyleGetPaddingJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge) { YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer); @@ -572,8 +578,8 @@ static jlong jni_YGNodeStyleGetPaddingJNI( } static void jni_YGNodeStyleSetPaddingJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge, jfloat padding) { @@ -584,8 +590,8 @@ static void jni_YGNodeStyleSetPaddingJNI( } static void jni_YGNodeStyleSetPaddingPercentJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge, jfloat percent) { @@ -596,8 +602,8 @@ static void jni_YGNodeStyleSetPaddingPercentJNI( } static jfloat jni_YGNodeStyleGetBorderJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge) { YGNodeRef yogaNodeRef = _jlong2YGNodeRef(nativePointer); @@ -608,8 +614,8 @@ static jfloat jni_YGNodeStyleGetBorderJNI( } static void jni_YGNodeStyleSetBorderJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint edge, jfloat border) { @@ -671,8 +677,8 @@ static YGSize YGJNIMeasureFunc( } static void jni_YGNodeSetHasMeasureFuncJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jboolean hasMeasureFunc) { _jlong2YGNodeRef(nativePointer) @@ -698,8 +704,8 @@ static float YGJNIBaselineFunc( } static void jni_YGNodeSetHasBaselineFuncJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jboolean hasBaselineFunc) { _jlong2YGNodeRef(nativePointer) @@ -715,7 +721,10 @@ static void jni_YGNodePrintJNI(JNIEnv* env, jobject obj, jlong nativePointer) { #endif } -static jlong jni_YGNodeCloneJNI(JNIEnv* env, jobject obj, jlong nativePointer) { +static jlong jni_YGNodeCloneJNI( + JNIEnv* /*env*/, + jobject /*obj*/, + jlong nativePointer) { auto node = _jlong2YGNodeRef(nativePointer); const YGNodeRef clonedYogaNode = YGNodeClone(node); YGNodeSetContext(clonedYogaNode, YGNodeGetContext(node)); @@ -724,8 +733,8 @@ static jlong jni_YGNodeCloneJNI(JNIEnv* env, jobject obj, jlong nativePointer) { } static jfloat jni_YGNodeStyleGetGapJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint gutter) { return (jfloat) YGNodeStyleGetGap( @@ -733,8 +742,8 @@ static jfloat jni_YGNodeStyleGetGapJNI( } static void jni_YGNodeStyleSetGapJNI( - JNIEnv* env, - jobject obj, + JNIEnv* /*env*/, + jobject /*obj*/, jlong nativePointer, jint gutter, jfloat gapLength) { diff --git a/tests/YGAlignBaselineTest.cpp b/tests/YGAlignBaselineTest.cpp index 40d03fe7f5..92885725f0 100644 --- a/tests/YGAlignBaselineTest.cpp +++ b/tests/YGAlignBaselineTest.cpp @@ -10,27 +10,27 @@ #include static float _baselineFunc( - YGNodeRef node, - const float width, + YGNodeRef /*node*/, + const float /*width*/, const float height) { return height / 2; } static YGSize _measure1( - YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + YGNodeRef /*node*/, + float /*width*/, + YGMeasureMode /*widthMode*/, + float /*height*/, + YGMeasureMode /*heightMode*/) { return YGSize{42, 50}; } static YGSize _measure2( - YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + YGNodeRef /*node*/, + float /*width*/, + YGMeasureMode /*widthMode*/, + float /*height*/, + YGMeasureMode /*heightMode*/) { return YGSize{279, 126}; } diff --git a/tests/YGAspectRatioTest.cpp b/tests/YGAspectRatioTest.cpp index 2dce80c9dd..149ff43547 100644 --- a/tests/YGAspectRatioTest.cpp +++ b/tests/YGAspectRatioTest.cpp @@ -10,7 +10,7 @@ #include static YGSize _measure( - YGNodeRef node, + YGNodeRef /*node*/, float width, YGMeasureMode widthMode, float height, diff --git a/tests/YGBaselineFuncTest.cpp b/tests/YGBaselineFuncTest.cpp index b48fa9c697..f380100d47 100644 --- a/tests/YGBaselineFuncTest.cpp +++ b/tests/YGBaselineFuncTest.cpp @@ -9,7 +9,10 @@ #include #include -static float _baseline(YGNodeRef node, const float width, const float height) { +static float _baseline( + YGNodeRef node, + const float /*width*/, + const float /*height*/) { float* baseline = (float*) node->getContext(); return *baseline; } diff --git a/tests/YGLoggerTest.cpp b/tests/YGLoggerTest.cpp index 7c67b40b95..d1aa972741 100644 --- a/tests/YGLoggerTest.cpp +++ b/tests/YGLoggerTest.cpp @@ -14,9 +14,9 @@ namespace { char writeBuffer[4096]; int _unmanagedLogger( - const YGConfigRef config, - const YGNodeRef node, - YGLogLevel level, + const YGConfigRef /*config*/, + const YGNodeRef /*node*/, + YGLogLevel /*level*/, const char* format, va_list args) { return vsnprintf( diff --git a/tests/YGMeasureCacheTest.cpp b/tests/YGMeasureCacheTest.cpp index b3e053c4d4..86f9f5e644 100644 --- a/tests/YGMeasureCacheTest.cpp +++ b/tests/YGMeasureCacheTest.cpp @@ -46,10 +46,10 @@ static YGSize _measureMin( static YGSize _measure_84_49( YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + float /*width*/, + YGMeasureMode /*widthMode*/, + float /*height*/, + YGMeasureMode /*heightMode*/) { int* measureCount = (int*) node->getContext(); if (measureCount) { (*measureCount)++; diff --git a/tests/YGMeasureTest.cpp b/tests/YGMeasureTest.cpp index 11d4fd4ddc..bb046b58aa 100644 --- a/tests/YGMeasureTest.cpp +++ b/tests/YGMeasureTest.cpp @@ -11,10 +11,10 @@ static YGSize _measure( YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + float /*width*/, + YGMeasureMode /*widthMode*/, + float /*height*/, + YGMeasureMode /*heightMode*/) { int* measureCount = (int*) node->getContext(); if (measureCount) { (*measureCount)++; @@ -24,11 +24,11 @@ static YGSize _measure( } static YGSize _simulate_wrapping_text( - YGNodeRef node, + YGNodeRef /*node*/, float width, YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + float /*height*/, + YGMeasureMode /*heightMode*/) { if (widthMode == YGMeasureModeUndefined || width >= 68) { return YGSize{68, 16}; } @@ -37,11 +37,11 @@ static YGSize _simulate_wrapping_text( } static YGSize _measure_assert_negative( - YGNodeRef node, + YGNodeRef /*node*/, float width, - YGMeasureMode widthMode, + YGMeasureMode /*widthMode*/, float height, - YGMeasureMode heightMode) { + YGMeasureMode /*heightMode*/) { EXPECT_GE(width, 0); EXPECT_GE(height, 0); @@ -641,21 +641,21 @@ TEST(YogaTest, cant_call_negative_measure_horizontal) { } static YGSize _measure_90_10( - YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + YGNodeRef /*node*/, + float /*width*/, + YGMeasureMode /*widthMode*/, + float /*height*/, + YGMeasureMode /*heightMode*/) { return YGSize{90, 10}; } static YGSize _measure_100_100( - YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + YGNodeRef /*node*/, + float /*width*/, + YGMeasureMode /*widthMode*/, + float /*height*/, + YGMeasureMode /*heightMode*/) { return YGSize{100, 100}; } diff --git a/tests/YGRoundingFunctionTest.cpp b/tests/YGRoundingFunctionTest.cpp index e99ced89de..4405b855d0 100644 --- a/tests/YGRoundingFunctionTest.cpp +++ b/tests/YGRoundingFunctionTest.cpp @@ -43,11 +43,11 @@ TEST(YogaTest, rounding_value) { } static YGSize measureText( - YGNodeRef node, - float width, - YGMeasureMode widthMode, - float height, - YGMeasureMode heightMode) { + YGNodeRef /*node*/, + float /*width*/, + YGMeasureMode /*widthMode*/, + float /*height*/, + YGMeasureMode /*heightMode*/) { return YGSize{10, 10}; } diff --git a/tests/YGRoundingMeasureFuncTest.cpp b/tests/YGRoundingMeasureFuncTest.cpp index 166be5db97..745377d0dc 100644 --- a/tests/YGRoundingMeasureFuncTest.cpp +++ b/tests/YGRoundingMeasureFuncTest.cpp @@ -10,11 +10,11 @@ #include static YGSize _measureFloor( - YGNodeRef node, + YGNodeRef /*node*/, float width, - YGMeasureMode widthMode, + YGMeasureMode /*widthMode*/, float height, - YGMeasureMode heightMode) { + YGMeasureMode /*heightMode*/) { return YGSize{ width = 10.2f, height = 10.2f, @@ -22,11 +22,11 @@ static YGSize _measureFloor( } static YGSize _measureCeil( - YGNodeRef node, + YGNodeRef /*node*/, float width, - YGMeasureMode widthMode, + YGMeasureMode /*widthMode*/, float height, - YGMeasureMode heightMode) { + YGMeasureMode /*heightMode*/) { return YGSize{ width = 10.5f, height = 10.5f, @@ -34,11 +34,11 @@ static YGSize _measureCeil( } static YGSize _measureFractial( - YGNodeRef node, + YGNodeRef /*node*/, float width, - YGMeasureMode widthMode, + YGMeasureMode /*widthMode*/, float height, - YGMeasureMode heightMode) { + YGMeasureMode /*heightMode*/) { return YGSize{ width = 0.5f, height = 0.5f, From 8bbd7c1d888701ad06d3bd5fbe0d8645b553133a Mon Sep 17 00:00:00 2001 From: Nick Gerleman Date: Thu, 11 May 2023 09:39:41 -0700 Subject: [PATCH 2/2] Enable -Wextra in C++ builds (#1294) Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1294 X-link: https://github.com/facebook/react-native/pull/37383 Add -Wextra to the build, and fixup some more instances of -Wunused-parameter that it sufaces which were not automatically fixable. Reviewed By: javache Differential Revision: D45772846 fbshipit-source-id: 680498f66f2104c29a71366bf30dba8895d9baf4 --- Yoga.podspec | 1 + benchmark/YGBenchmark.c | 5 +- cmake/project-defaults.cmake | 1 + java/jni/YGJNIVanilla.cpp | 117 ++++++++++++++++++----------------- java/jni/corefunctions.cpp | 1 + tests/EventsTest.cpp | 2 +- tests/util/TestUtil.cpp | 4 +- yoga/Yoga.cpp | 4 +- 8 files changed, 73 insertions(+), 62 deletions(-) diff --git a/Yoga.podspec b/Yoga.podspec index 957ee98e96..4ba88080f2 100644 --- a/Yoga.podspec +++ b/Yoga.podspec @@ -30,6 +30,7 @@ Pod::Spec.new do |spec| '-fexceptions', '-Wall', '-Werror', + '-Wextra', '-std=c++14', '-fPIC' ] diff --git a/benchmark/YGBenchmark.c b/benchmark/YGBenchmark.c index 771d51b6a1..ff1f664639 100644 --- a/benchmark/YGBenchmark.c +++ b/benchmark/YGBenchmark.c @@ -17,6 +17,8 @@ #define YGBENCHMARKS(BLOCK) \ int main(int argc, char const* argv[]) { \ + (void) argc; \ + (void) argv; \ clock_t __start; \ clock_t __endTimes[NUM_REPETITIONS]; \ { BLOCK } \ @@ -78,9 +80,10 @@ static YGSize _measure( YGMeasureMode widthMode, float height, YGMeasureMode heightMode) { + (void) node; return (YGSize){ .width = widthMode == YGMeasureModeUndefined ? 10 : width, - .height = heightMode == YGMeasureModeUndefined ? 10 : width, + .height = heightMode == YGMeasureModeUndefined ? 10 : height, }; } diff --git a/cmake/project-defaults.cmake b/cmake/project-defaults.cmake index 87f0e6b791..b6b37bccc1 100644 --- a/cmake/project-defaults.cmake +++ b/cmake/project-defaults.cmake @@ -33,6 +33,7 @@ add_compile_options( -fexceptions # Enable warnings and warnings as errors -Wall + -Wextra -Werror # Disable RTTI $<$:-fno-rtti> diff --git a/java/jni/YGJNIVanilla.cpp b/java/jni/YGJNIVanilla.cpp index 5b7940b8f9..b054ae0c7c 100644 --- a/java/jni/YGJNIVanilla.cpp +++ b/java/jni/YGJNIVanilla.cpp @@ -424,73 +424,73 @@ static void jni_YGNodeCopyStyleJNI( _jlong2YGNodeRef(dstNativePointer), _jlong2YGNodeRef(srcNativePointer)); } -#define YG_NODE_JNI_STYLE_PROP(javatype, type, name) \ - static javatype jni_YGNodeStyleGet##name##JNI( \ - JNIEnv* env, jobject obj, jlong nativePointer) { \ - return (javatype) YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer)); \ +#define YG_NODE_JNI_STYLE_PROP(javatype, type, name) \ + static javatype jni_YGNodeStyleGet##name##JNI( \ + JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) { \ + return (javatype) YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer)); \ + } \ + \ + static void jni_YGNodeStyleSet##name##JNI( \ + JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer, javatype value) { \ + YGNodeStyleSet##name( \ + _jlong2YGNodeRef(nativePointer), static_cast(value)); \ + } + +#define YG_NODE_JNI_STYLE_UNIT_PROP(name) \ + static jlong jni_YGNodeStyleGet##name##JNI( \ + JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) { \ + return YogaValue::asJavaLong( \ + YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer))); \ } \ \ static void jni_YGNodeStyleSet##name##JNI( \ - JNIEnv* env, jobject obj, jlong nativePointer, javatype value) { \ + JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer, jfloat value) { \ YGNodeStyleSet##name( \ - _jlong2YGNodeRef(nativePointer), static_cast(value)); \ - } - -#define YG_NODE_JNI_STYLE_UNIT_PROP(name) \ - static jlong jni_YGNodeStyleGet##name##JNI( \ - JNIEnv* env, jobject obj, jlong nativePointer) { \ - return YogaValue::asJavaLong( \ - YGNodeStyleGet##name(_jlong2YGNodeRef(nativePointer))); \ - } \ - \ - static void jni_YGNodeStyleSet##name##JNI( \ - JNIEnv* env, jobject obj, jlong nativePointer, jfloat value) { \ - YGNodeStyleSet##name( \ - _jlong2YGNodeRef(nativePointer), static_cast(value)); \ - } \ - \ - static void jni_YGNodeStyleSet##name##PercentJNI( \ - JNIEnv* env, jobject obj, jlong nativePointer, jfloat value) { \ - YGNodeStyleSet##name##Percent( \ - _jlong2YGNodeRef(nativePointer), static_cast(value)); \ + _jlong2YGNodeRef(nativePointer), static_cast(value)); \ + } \ + \ + static void jni_YGNodeStyleSet##name##PercentJNI( \ + JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer, jfloat value) { \ + YGNodeStyleSet##name##Percent( \ + _jlong2YGNodeRef(nativePointer), static_cast(value)); \ } #define YG_NODE_JNI_STYLE_UNIT_PROP_AUTO(name) \ YG_NODE_JNI_STYLE_UNIT_PROP(name) \ static void jni_YGNodeStyleSet##name##AutoJNI( \ - JNIEnv* env, jobject obj, jlong nativePointer) { \ + JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer) { \ YGNodeStyleSet##name##Auto(_jlong2YGNodeRef(nativePointer)); \ } -#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name) \ - static jlong jni_YGNodeStyleGet##name##JNI( \ - JNIEnv* env, jobject obj, jlong nativePointer, jint edge) { \ - return YogaValue::asJavaLong(YGNodeStyleGet##name( \ - _jlong2YGNodeRef(nativePointer), static_cast(edge))); \ - } \ - \ - static void jni_YGNodeStyleSet##name##JNI( \ - JNIEnv* env, \ - jobject obj, \ - jlong nativePointer, \ - jint edge, \ - jfloat value) { \ - YGNodeStyleSet##name( \ - _jlong2YGNodeRef(nativePointer), \ - static_cast(edge), \ - static_cast(value)); \ - } \ - \ - static void jni_YGNodeStyleSet##name##PercentJNI( \ - JNIEnv* env, \ - jobject obj, \ - jlong nativePointer, \ - jint edge, \ - jfloat value) { \ - YGNodeStyleSet##name##Percent( \ - _jlong2YGNodeRef(nativePointer), \ - static_cast(edge), \ - static_cast(value)); \ +#define YG_NODE_JNI_STYLE_EDGE_UNIT_PROP(name) \ + static jlong jni_YGNodeStyleGet##name##JNI( \ + JNIEnv* /*env*/, jobject /*obj*/, jlong nativePointer, jint edge) { \ + return YogaValue::asJavaLong(YGNodeStyleGet##name( \ + _jlong2YGNodeRef(nativePointer), static_cast(edge))); \ + } \ + \ + static void jni_YGNodeStyleSet##name##JNI( \ + JNIEnv* /*env*/, \ + jobject /*obj*/, \ + jlong nativePointer, \ + jint edge, \ + jfloat value) { \ + YGNodeStyleSet##name( \ + _jlong2YGNodeRef(nativePointer), \ + static_cast(edge), \ + static_cast(value)); \ + } \ + \ + static void jni_YGNodeStyleSet##name##PercentJNI( \ + JNIEnv* /*env*/, \ + jobject /*obj*/, \ + jlong nativePointer, \ + jint edge, \ + jfloat value) { \ + YGNodeStyleSet##name##Percent( \ + _jlong2YGNodeRef(nativePointer), \ + static_cast(edge), \ + static_cast(value)); \ } YG_NODE_JNI_STYLE_PROP(jint, YGDirection, Direction); @@ -712,12 +712,17 @@ static void jni_YGNodeSetHasBaselineFuncJNI( ->setBaselineFunc(hasBaselineFunc ? YGJNIBaselineFunc : nullptr); } -static void jni_YGNodePrintJNI(JNIEnv* env, jobject obj, jlong nativePointer) { +static void jni_YGNodePrintJNI( + JNIEnv* /*env*/, + jobject /*obj*/, + jlong nativePointer) { #ifdef DEBUG const YGNodeRef node = _jlong2YGNodeRef(nativePointer); YGNodePrint( node, (YGPrintOptions) (YGPrintOptionsStyle | YGPrintOptionsLayout | YGPrintOptionsChildren)); +#else + (void) nativePointer; #endif } diff --git a/java/jni/corefunctions.cpp b/java/jni/corefunctions.cpp index 1f8c3f75c6..bbdcebd323 100644 --- a/java/jni/corefunctions.cpp +++ b/java/jni/corefunctions.cpp @@ -56,6 +56,7 @@ JNIEXPORT JNIEnv* getCurrentEnv() { } void logErrorMessageAndDie(const char* message) { + (void) message; VANILLAJNI_LOG_ERROR( "VanillaJni", "Aborting due to error detected in native code: %s", diff --git a/tests/EventsTest.cpp b/tests/EventsTest.cpp index 810fe53e27..78e7345962 100644 --- a/tests/EventsTest.cpp +++ b/tests/EventsTest.cpp @@ -290,7 +290,7 @@ EventArgs createArgs(const YGNode& node, const Event::Data data) { using Data = Event::TypedData; auto deleteData = [](void* x) { delete static_cast(x); }; - return {&node, E, {new Data{(data.get())}, deleteData}}; + return {&node, E, {new Data{(data.get())}, deleteData}, nullptr}; } template diff --git a/tests/util/TestUtil.cpp b/tests/util/TestUtil.cpp index 3b54f07ac7..ab7ff50496 100644 --- a/tests/util/TestUtil.cpp +++ b/tests/util/TestUtil.cpp @@ -19,9 +19,9 @@ int nodeInstanceCount = 0; namespace { void yogaEventSubscriber( - const YGNode& node, + const YGNode& /*node*/, Event::Type eventType, - const Event::Data& eventData) { + const Event::Data& /*eventData*/) { switch (eventType) { case Event::NodeAllocation: diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp index 1eccddbd0f..98fa7adbf0 100644 --- a/yoga/Yoga.cpp +++ b/yoga/Yoga.cpp @@ -42,8 +42,8 @@ static int YGDefaultLog( #ifdef ANDROID #include static int YGAndroidLog( - const YGConfigRef config, - const YGNodeRef node, + const YGConfigRef /*config*/, + const YGNodeRef /*node*/, YGLogLevel level, const char* format, va_list args) {