From dc795cd4f3d064cbbe2bf9899bf2088d206b7434 Mon Sep 17 00:00:00 2001 From: Chih-Hung Hsieh Date: Wed, 8 Jun 2016 17:45:40 -0700 Subject: [PATCH] Fix misc-macro-parentheses warnings in deqp. * Add parentheses around macro parameters beside binary operators. * Add NOLINT to suppress wrong clang-tidy warnings. Bug: 28705665 Change-Id: I8cab8cf2df6edb50806d9fd2324dfea31b127916 --- .../vulkancts/framework/vulkan/vkNullDriver.cpp | 2 +- .../vulkan/pipeline/vktPipelineImageViewTests.cpp | 2 +- .../vktShaderBuiltinPrecisionTests.cpp | 18 ++--- .../shaderrender/vktShaderRenderStructTests.cpp | 14 ++-- .../spirv_assembly/vktSpvAsmInstructionTests.cpp | 4 +- framework/common/tcuInterval.hpp | 12 ++-- framework/delibs/debase/deDefs.h | 5 +- framework/delibs/depool/dePoolArray.h | 66 +++++++++--------- framework/delibs/depool/dePoolHash.h | 30 ++++----- framework/delibs/depool/dePoolHashArray.h | 16 ++--- framework/delibs/depool/dePoolHashSet.h | 24 +++---- framework/delibs/depool/dePoolHeap.h | 32 ++++----- framework/delibs/depool/dePoolMultiSet.h | 58 ++++++++-------- framework/delibs/depool/dePoolSet.h | 78 +++++++++++----------- framework/delibs/deutil/deSocket.c | 2 +- modules/egl/teglApiCase.hpp | 2 +- modules/egl/teglImageTests.cpp | 2 +- .../gles2/accuracy/es2aTextureFilteringTests.cpp | 2 +- modules/gles2/functional/es2fApiCase.hpp | 2 +- .../functional/es2fBooleanStateQueryTests.cpp | 2 +- .../functional/es2fBufferObjectQueryTests.cpp | 2 +- .../functional/es2fDefaultVertexAttributeTests.cpp | 4 +- .../gles2/functional/es2fFloatStateQueryTests.cpp | 2 +- .../functional/es2fIntegerStateQueryTests.cpp | 4 +- .../gles2/functional/es2fShaderAlgorithmTests.cpp | 2 +- modules/gles2/functional/es2fShaderStructTests.cpp | 10 +-- .../gles2/functional/es2fTextureFilteringTests.cpp | 2 +- .../functional/es2fTextureStateQueryTests.cpp | 2 +- modules/gles2/functional/es2fTextureWrapTests.cpp | 2 +- modules/gles2/functional/es2fUniformApiTests.cpp | 4 +- .../gles2/functional/es2fVertexTextureTests.cpp | 2 +- .../gles2/performance/es2pTextureUploadTests.cpp | 2 +- .../gles3/accuracy/es3aTextureFilteringTests.cpp | 2 +- modules/gles3/functional/es3fApiCase.hpp | 2 +- .../functional/es3fBooleanStateQueryTests.cpp | 2 +- .../functional/es3fBufferObjectQueryTests.cpp | 2 +- .../functional/es3fDefaultVertexAttributeTests.cpp | 8 +-- .../gles3/functional/es3fFloatStateQueryTests.cpp | 2 +- .../functional/es3fInteger64StateQueryTests.cpp | 2 +- .../functional/es3fIntegerStateQueryTests.cpp | 4 +- .../functional/es3fSamplerStateQueryTests.cpp | 2 +- modules/gles3/functional/es3fShaderStructTests.cpp | 10 +-- .../functional/es3fTextureStateQueryTests.cpp | 2 +- modules/gles3/functional/es3fTextureWrapTests.cpp | 2 +- modules/gles3/functional/es3fUniformApiTests.cpp | 4 +- .../gles3/functional/es3fVertexTextureTests.cpp | 2 +- .../functional/es31fBooleanStateQueryTests.cpp | 4 +- .../functional/es31fSamplerStateQueryTests.cpp | 4 +- .../functional/es31fTextureStateQueryTests.cpp | 4 +- modules/glshared/glsBuiltinPrecisionTests.cpp | 18 ++--- modules/glshared/glsTextureStateQueryTests.cpp | 2 +- 51 files changed, 249 insertions(+), 240 deletions(-) diff --git a/external/vulkancts/framework/vulkan/vkNullDriver.cpp b/external/vulkancts/framework/vulkan/vkNullDriver.cpp index 1beae03..e24fb20 100644 --- a/external/vulkancts/framework/vulkan/vkNullDriver.cpp +++ b/external/vulkancts/framework/vulkan/vkNullDriver.cpp @@ -146,7 +146,7 @@ void freeNonDispHandle (Handle handle, const VkAllocationCallbacks* pAllocator) } while (deGetFalse()) // \todo [2015-07-14 pyry] Check FUNC type by checkedCastToPtr() or similar -#define VK_NULL_FUNC_ENTRY(NAME, FUNC) { #NAME, (deFunctionPtr)FUNC } +#define VK_NULL_FUNC_ENTRY(NAME, FUNC) { #NAME, (deFunctionPtr)FUNC } // NOLINT(FUNC) #define VK_NULL_DEFINE_DEVICE_OBJ(NAME) \ struct NAME \ diff --git a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp index 2413067..967691f 100644 --- a/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp +++ b/external/vulkancts/modules/vulkan/pipeline/vktPipelineImageViewTests.cpp @@ -352,7 +352,7 @@ static de::MovePtr createSubresourceRangeTests(tcu::TestCont for (int configNdx = 0; configNdx < DE_LENGTH_OF_ARRAY(TEST_CASES); configNdx++) \ { \ std::ostringstream desc; \ - const TestCaseConfig config = TEST_CASES[configNdx]; \ + const TestCaseConfig config = (TEST_CASES)[configNdx]; \ desc << "Samples level " << config.samplerLod << " with :\n" << config.subresourceRange; \ rangeTests->addChild(new ImageViewTest(testCtx, config.name, desc.str().c_str(), viewType, \ imageFormat, config.samplerLod, componentMapping, \ diff --git a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp index 18a89ad..ea060c4 100644 --- a/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderexecutor/vktShaderBuiltinPrecisionTests.cpp @@ -2133,7 +2133,7 @@ ExprP log (const ExprP& x) { return app(x); } ExprP NAME (const ExprP& arg0) { return app(arg0); } #define DEFINE_DERIVED1(CLASS, TRET, NAME, T0, ARG0, EXPANSION) \ -class CLASS : public DerivedFunc > \ +class CLASS : public DerivedFunc > /* NOLINT(CLASS) */ \ { \ public: \ string getName (void) const { return #NAME; } \ @@ -2142,7 +2142,7 @@ protected: \ ExprP doExpand (ExpandContext&, \ const CLASS::ArgExprs& args_) const \ { \ - const ExprP& ARG0 = args_.a; \ + const ExprP& (ARG0) = args_.a; \ return EXPANSION; \ } \ }; \ @@ -2158,7 +2158,7 @@ ExprP NAME (const ExprP& arg0, const ExprP& arg1) \ } #define DEFINE_DERIVED2(CLASS, TRET, NAME, T0, Arg0, T1, Arg1, EXPANSION) \ -class CLASS : public DerivedFunc > \ +class CLASS : public DerivedFunc > /* NOLINT(CLASS) */ \ { \ public: \ string getName (void) const { return #NAME; } \ @@ -2166,8 +2166,8 @@ public: \ protected: \ ExprP doExpand (ExpandContext&, const ArgExprs& args_) const \ { \ - const ExprP& Arg0 = args_.a; \ - const ExprP& Arg1 = args_.b; \ + const ExprP& (Arg0) = args_.a; \ + const ExprP& (Arg1) = args_.b; \ return EXPANSION; \ } \ }; \ @@ -2183,7 +2183,7 @@ ExprP NAME (const ExprP& arg0, const ExprP& arg1, const ExprP& } #define DEFINE_DERIVED3(CLASS, TRET, NAME, T0, ARG0, T1, ARG1, T2, ARG2, EXPANSION) \ -class CLASS : public DerivedFunc > \ +class CLASS : public DerivedFunc > /* NOLINT(CLASS) */ \ { \ public: \ string getName (void) const { return #NAME; } \ @@ -2191,9 +2191,9 @@ public: \ protected: \ ExprP doExpand (ExpandContext&, const ArgExprs& args_) const \ { \ - const ExprP& ARG0 = args_.a; \ - const ExprP& ARG1 = args_.b; \ - const ExprP& ARG2 = args_.c; \ + const ExprP& (ARG0) = args_.a; \ + const ExprP& (ARG1) = args_.b; \ + const ExprP& (ARG2) = args_.c; \ return EXPANSION; \ } \ }; \ diff --git a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp index 60d454f..8e11acb 100644 --- a/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp +++ b/external/vulkancts/modules/vulkan/shaderrender/vktShaderRenderStructTests.cpp @@ -145,10 +145,10 @@ public: void LocalStructTests::init (void) { - #define LOCAL_STRUCT_CASE(NAME, DESCRIPTION, SHADER_SRC, SET_UNIFORMS_BODY, EVAL_FUNC_BODY) \ - do { \ - struct SetUniforms_##NAME { static void setUniforms (ShaderRenderCaseInstance& instance, const tcu::Vec4&) SET_UNIFORMS_BODY }; \ - struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; \ + #define LOCAL_STRUCT_CASE(NAME, DESCRIPTION, SHADER_SRC, SET_UNIFORMS_BODY, EVAL_FUNC_BODY) \ + do { \ + struct SetUniforms_##NAME { static void setUniforms (ShaderRenderCaseInstance& instance, const tcu::Vec4&) SET_UNIFORMS_BODY }; /* NOLINT(SET_UNIFORMS_BODY) */ \ + struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; /* NOLINT(EVAL_FUNC_BODY) */ \ addChild(createStructCase(m_testCtx, #NAME "_vertex", DESCRIPTION, true, &Eval_##NAME::eval, &SetUniforms_##NAME::setUniforms, SHADER_SRC).release()); \ addChild(createStructCase(m_testCtx, #NAME "_fragment", DESCRIPTION, false, &Eval_##NAME::eval, &SetUniforms_##NAME::setUniforms, SHADER_SRC).release()); \ } while (deGetFalse()) @@ -1245,8 +1245,10 @@ void UniformStructTests::init (void) { #define UNIFORM_STRUCT_CASE(NAME, DESCRIPTION, SHADER_SRC, SET_UNIFORMS_BODY, EVAL_FUNC_BODY) \ do { \ - struct SetUniforms_##NAME { static void setUniforms (ShaderRenderCaseInstance& instance, const tcu::Vec4& constCoords) SET_UNIFORMS_BODY }; \ - struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; \ + struct SetUniforms_##NAME { \ + static void setUniforms (ShaderRenderCaseInstance& instance, const tcu::Vec4& constCoords) SET_UNIFORMS_BODY /* NOLINT(SET_UNIFORMS_BODY) */ \ + }; \ + struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; /* NOLINT(EVAL_FUNC_BODY) */ \ addChild(createStructCase(m_testCtx, #NAME "_vertex", DESCRIPTION, true, Eval_##NAME::eval, SetUniforms_##NAME::setUniforms, SHADER_SRC).release()); \ addChild(createStructCase(m_testCtx, #NAME "_fragment", DESCRIPTION, false, Eval_##NAME::eval, SetUniforms_##NAME::setUniforms, SHADER_SRC).release()); \ } while (deGetFalse()) diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index 972b428..c104758 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -452,8 +452,8 @@ tcu::TestCaseGroup* createOpAtomicGroup (tcu::TestContext& testCtx) #define ADD_OPATOMIC_CASE(NAME, ASSEMBLY, CALCULATE_EXPECTED, NUM_OUTPUT_ELEMENTS) \ do { \ - DE_STATIC_ASSERT(NUM_OUTPUT_ELEMENTS == 1 || NUM_OUTPUT_ELEMENTS == numElements); \ - struct calculateExpected_##NAME { static void calculateExpected(deInt32& expected, deInt32 input) CALCULATE_EXPECTED }; \ + DE_STATIC_ASSERT((NUM_OUTPUT_ELEMENTS) == 1 || (NUM_OUTPUT_ELEMENTS) == numElements); \ + struct calculateExpected_##NAME { static void calculateExpected(deInt32& expected, deInt32 input) CALCULATE_EXPECTED }; /* NOLINT(CALCULATE_EXPECTED) */ \ cases.push_back(OpAtomicCase(#NAME, ASSEMBLY, calculateExpected_##NAME::calculateExpected, NUM_OUTPUT_ELEMENTS)); \ } while (deGetFalse()) #define ADD_OPATOMIC_CASE_1(NAME, ASSEMBLY, CALCULATE_EXPECTED) ADD_OPATOMIC_CASE(NAME, ASSEMBLY, CALCULATE_EXPECTED, 1) diff --git a/framework/common/tcuInterval.hpp b/framework/common/tcuInterval.hpp index 0c29d57..75c7d65 100644 --- a/framework/common/tcuInterval.hpp +++ b/framework/common/tcuInterval.hpp @@ -179,12 +179,12 @@ std::ostream& operator<< (std::ostream& os, const Interval& interval); ::tcu::Interval VAR##_hi_; \ \ { \ - ::tcu::Interval& VAR = VAR##_lo_; \ + ::tcu::Interval& (VAR) = VAR##_lo_; \ ::deSetRoundingMode(DE_ROUNDINGMODE_TO_NEGATIVE_INF); \ SETLOW; \ } \ { \ - ::tcu::Interval& VAR = VAR##_hi_; \ + ::tcu::Interval& (VAR) = VAR##_hi_; \ ::deSetRoundingMode(DE_ROUNDINGMODE_TO_POSITIVE_INF); \ SETHIGH; \ } \ @@ -211,13 +211,13 @@ std::ostream& operator<< (std::ostream& os, const Interval& interval); else \ { \ { \ - const double PARAM = VAR##_arg_.lo(); \ - ::tcu::Interval& VAR = VAR##_lo_; \ + const double (PARAM) = VAR##_arg_.lo(); \ + ::tcu::Interval& (VAR) = VAR##_lo_; \ BODY; \ } \ { \ - const double PARAM = VAR##_arg_.hi(); \ - ::tcu::Interval& VAR = VAR##_hi_; \ + const double (PARAM) = VAR##_arg_.hi(); \ + ::tcu::Interval& (VAR) = VAR##_hi_; \ BODY; \ } \ VAR##_dst_ = VAR##_lo_ | VAR##_hi_; \ diff --git a/framework/delibs/debase/deDefs.h b/framework/delibs/debase/deDefs.h index 42826f7..1a809b7 100644 --- a/framework/delibs/debase/deDefs.h +++ b/framework/delibs/debase/deDefs.h @@ -207,6 +207,9 @@ typedef int deBool; /* Function pointer type. */ typedef void (*deFunctionPtr) (void); +/* Use DE_PTR_TYPE(T) instead of T* in macros to avoid clang-tidy warning. */ +#define DE_PTR_TYPE(T) T* /* NOLINT(T) */ + /* Debug macro. */ #if defined(DE_DEBUG) /* Already defined from outside. */ @@ -324,7 +327,7 @@ DE_INLINE deBool deGetTrue (void) { return DE_TRUE; } #endif /** Swap two values. */ -#define DE_SWAP(TYPE, A, B) do { TYPE _tmp_ = A; A = B; B = _tmp_; } while(deGetFalse()) +#define DE_SWAP(TYPE, A, B) do { TYPE _tmp_ = (A); (A) = (B); (B) = _tmp_; } while(deGetFalse()) /** Offset of a struct member. */ #define DE_OFFSET_OF(STRUCT, MEMBER) ((int)(deUintptr)(deUint8*)&(((STRUCT*)0)->MEMBER)) diff --git a/framework/delibs/depool/dePoolArray.h b/framework/delibs/depool/dePoolArray.h index 8cf494f..e8e0c08 100644 --- a/framework/delibs/depool/dePoolArray.h +++ b/framework/delibs/depool/dePoolArray.h @@ -91,29 +91,29 @@ DE_END_EXTERN_C *//*--------------------------------------------------------------------*/ #define DE_DECLARE_POOL_ARRAY(TYPENAME, VALUETYPE) \ \ -typedef struct TYPENAME##_s \ -{ \ - deMemPool* pool; \ -\ - int elementSize; \ - int numElements; \ - int capacity; \ -\ - int pageTableCapacity; \ - VALUETYPE** pageTable; \ -} TYPENAME; \ +typedef struct TYPENAME##_s \ +{ \ + deMemPool* pool; \ + \ + int elementSize; \ + int numElements; \ + int capacity; \ + \ + int pageTableCapacity; \ + DE_PTR_TYPE(VALUETYPE)* pageTable; \ +} TYPENAME; /* NOLINT(TYPENAME) */ \ \ -DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool); \ -DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* arr) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_reserve (TYPENAME* arr, int capacity) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_setSize (TYPENAME* arr, int size) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_reset (TYPENAME* arr) DE_UNUSED_FUNCTION; \ -DE_INLINE VALUETYPE TYPENAME##_get (const TYPENAME* arr, int ndx) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_set (TYPENAME* arr, int ndx, VALUETYPE elem) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_pushBack (TYPENAME* arr, VALUETYPE elem) DE_UNUSED_FUNCTION; \ -DE_INLINE VALUETYPE TYPENAME##_popBack (TYPENAME* arr) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_copy (TYPENAME* dst, const TYPENAME* src) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_swap (TYPENAME* arr, int aNdx, int bNdx) DE_UNUSED_FUNCTION; \ +DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool); \ +DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* arr) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_reserve (DE_PTR_TYPE(TYPENAME) arr, int capacity) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_setSize (DE_PTR_TYPE(TYPENAME) arr, int size) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) arr) DE_UNUSED_FUNCTION; \ +DE_INLINE VALUETYPE TYPENAME##_get (const TYPENAME* arr, int ndx) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_set (DE_PTR_TYPE(TYPENAME) arr, int ndx, VALUETYPE elem) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_pushBack (DE_PTR_TYPE(TYPENAME) arr, VALUETYPE elem) DE_UNUSED_FUNCTION; \ +DE_INLINE VALUETYPE TYPENAME##_popBack (DE_PTR_TYPE(TYPENAME) arr) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_copy (DE_PTR_TYPE(TYPENAME) dst, const TYPENAME* src) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_swap (DE_PTR_TYPE(TYPENAME) arr, int aNdx, int bNdx) DE_UNUSED_FUNCTION; \ \ DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool) \ { \ @@ -125,14 +125,14 @@ DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* arr) \ return arr->numElements; \ } \ \ -DE_INLINE deBool TYPENAME##_reserve (TYPENAME* arr, int capacity) \ +DE_INLINE deBool TYPENAME##_reserve (DE_PTR_TYPE(TYPENAME) arr, int capacity) \ { \ if (capacity > arr->capacity) \ return dePoolArray_reserve((dePoolArray*)arr, capacity); \ return DE_TRUE; \ } \ \ -DE_INLINE deBool TYPENAME##_setSize (TYPENAME* arr, int size) \ +DE_INLINE deBool TYPENAME##_setSize (DE_PTR_TYPE(TYPENAME) arr, int size) \ { \ if (size > arr->capacity) \ return dePoolArray_setSize((dePoolArray*)arr, size); \ @@ -141,7 +141,7 @@ DE_INLINE deBool TYPENAME##_setSize (TYPENAME* arr, int size) \ return DE_TRUE; \ } \ \ -DE_INLINE void TYPENAME##_reset (TYPENAME* arr) \ +DE_INLINE void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) arr) \ { \ arr->numElements = 0; \ } \ @@ -156,7 +156,7 @@ DE_INLINE VALUETYPE TYPENAME##_get (const TYPENAME* arr, int ndx) \ } \ } \ \ -DE_INLINE void TYPENAME##_set (TYPENAME* arr, int ndx, VALUETYPE elem) \ +DE_INLINE void TYPENAME##_set (DE_PTR_TYPE(TYPENAME) arr, int ndx, VALUETYPE elem) \ { \ DE_ASSERT(ndx >= 0 && ndx < arr->numElements); \ { \ @@ -166,7 +166,7 @@ DE_INLINE void TYPENAME##_set (TYPENAME* arr, int ndx, VALUETYPE elem) \ } \ } \ \ -DE_INLINE deBool TYPENAME##_pushBack (TYPENAME* arr, VALUETYPE elem) \ +DE_INLINE deBool TYPENAME##_pushBack (DE_PTR_TYPE(TYPENAME) arr, VALUETYPE elem) \ { \ if ((arr->numElements + 1 >= arr->capacity) && !TYPENAME##_reserve(arr, arr->numElements + 1)) \ return DE_FALSE; \ @@ -175,7 +175,7 @@ DE_INLINE deBool TYPENAME##_pushBack (TYPENAME* arr, VALUETYPE elem) \ return DE_TRUE; \ } \ \ -DE_INLINE VALUETYPE TYPENAME##_popBack (TYPENAME* arr) \ +DE_INLINE VALUETYPE TYPENAME##_popBack (DE_PTR_TYPE(TYPENAME) arr) \ { \ int ndx = arr->numElements - 1; \ int pageNdx = (ndx >> DE_ARRAY_ELEMENTS_PER_PAGE_LOG2); \ @@ -186,7 +186,7 @@ DE_INLINE VALUETYPE TYPENAME##_popBack (TYPENAME* arr) \ return ((VALUETYPE*)arr->pageTable[pageNdx])[subNdx]; \ } \ \ -DE_INLINE deBool TYPENAME##_copy (TYPENAME* dst, const TYPENAME* src) \ +DE_INLINE deBool TYPENAME##_copy (DE_PTR_TYPE(TYPENAME) dst, const TYPENAME* src) \ { \ DE_ASSERT(dst && src); \ { \ @@ -200,7 +200,7 @@ DE_INLINE deBool TYPENAME##_copy (TYPENAME* dst, const TYPENAME* src) \ return DE_TRUE; \ } \ \ -DE_INLINE void TYPENAME##_swap (TYPENAME* arr, int aNdx, int bNdx) \ +DE_INLINE void TYPENAME##_swap (DE_PTR_TYPE(TYPENAME) arr, int aNdx, int bNdx) \ { \ VALUETYPE tmp = TYPENAME##_get(arr, aNdx); \ TYPENAME##_set(arr, aNdx, TYPENAME##_get(arr, bNdx)); \ @@ -238,7 +238,7 @@ struct TYPENAME##Dummy_s { int dummy; } *//*--------------------------------------------------------------------*/ #define DE_DECLARE_POOL_ARRAY_SORT(TYPENAME, VALUETYPE, SORTNAME, CMPFUNC) \ \ -DE_INLINE void TYPENAME##_##SORTNAME##ShiftDown (TYPENAME* arr, int startNdx, int endNdx) \ +DE_INLINE void TYPENAME##_##SORTNAME##ShiftDown (DE_PTR_TYPE(TYPENAME) arr, int startNdx, int endNdx) \ { \ int rootNdx = startNdx; \ \ @@ -259,7 +259,7 @@ DE_INLINE void TYPENAME##_##SORTNAME##ShiftDown (TYPENAME* arr, int startNdx, in } \ } \ \ -DE_INLINE void TYPENAME##_##SORTNAME##Heapify (TYPENAME* arr) \ +DE_INLINE void TYPENAME##_##SORTNAME##Heapify (DE_PTR_TYPE(TYPENAME) arr) \ { \ int startNdx = (TYPENAME##_getNumElements(arr) - 2) / 2; \ \ @@ -270,7 +270,7 @@ DE_INLINE void TYPENAME##_##SORTNAME##Heapify (TYPENAME* arr) \ } \ } \ \ -DE_INLINE void TYPENAME##_##SORTNAME (TYPENAME* arr) \ +DE_INLINE void TYPENAME##_##SORTNAME (DE_PTR_TYPE(TYPENAME) arr) \ { \ int endNdx = TYPENAME##_getNumElements(arr) - 1; \ \ diff --git a/framework/delibs/depool/dePoolHash.h b/framework/delibs/depool/dePoolHash.h index 8aedba9..b8b6a78 100644 --- a/framework/delibs/depool/dePoolHash.h +++ b/framework/delibs/depool/dePoolHash.h @@ -84,7 +84,7 @@ typedef struct TYPENAME##_s \ int slotTableSize; \ TYPENAME##Slot** slotTable; \ TYPENAME##Slot* slotFreeList; \ -} TYPENAME; \ +} TYPENAME; /* NOLINT(TYPENAME) */ \ \ typedef struct TYPENAME##Iter_s \ { \ @@ -94,12 +94,12 @@ typedef struct TYPENAME##Iter_s \ int curElemIndex; \ } TYPENAME##Iter; \ \ -TYPENAME* TYPENAME##_create (deMemPool* pool); \ -void TYPENAME##_reset (TYPENAME* hash); \ -deBool TYPENAME##_reserve (TYPENAME* hash, int capacity); \ -VALUETYPE* TYPENAME##_find (const TYPENAME* hash, KEYTYPE key); \ -deBool TYPENAME##_insert (TYPENAME* hash, KEYTYPE key, VALUETYPE value); \ -void TYPENAME##_delete (TYPENAME* hash, KEYTYPE key); \ +TYPENAME* TYPENAME##_create (deMemPool* pool); \ +void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) hash); \ +deBool TYPENAME##_reserve (DE_PTR_TYPE(TYPENAME) hash, int capacity); \ +VALUETYPE* TYPENAME##_find (const TYPENAME* hash, KEYTYPE key); \ +deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) hash, KEYTYPE key, VALUETYPE value); \ +void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) hash, KEYTYPE key); \ \ DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* hash) DE_UNUSED_FUNCTION; \ DE_INLINE void TYPENAME##Iter_init (const TYPENAME* hash, TYPENAME##Iter* iter) DE_UNUSED_FUNCTION; \ @@ -202,7 +202,7 @@ struct TYPENAME##Dummy_s { int dummy; } TYPENAME* TYPENAME##_create (deMemPool* pool) \ { \ /* Alloc struct. */ \ - TYPENAME* hash = DE_POOL_NEW(pool, TYPENAME); \ + DE_PTR_TYPE(TYPENAME) hash = DE_POOL_NEW(pool, TYPENAME); \ if (!hash) \ return DE_NULL; \ \ @@ -212,7 +212,7 @@ TYPENAME* TYPENAME##_create (deMemPool* pool) \ return hash; \ } \ \ -void TYPENAME##_reset (TYPENAME* hash) \ +void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) hash) \ { \ int slotNdx; \ for (slotNdx = 0; slotNdx < hash->slotTableSize; slotNdx++) \ @@ -231,7 +231,7 @@ void TYPENAME##_reset (TYPENAME* hash) \ hash->numElements = 0; \ } \ \ -TYPENAME##Slot* TYPENAME##_allocSlot (TYPENAME* hash) \ +TYPENAME##Slot* TYPENAME##_allocSlot (DE_PTR_TYPE(TYPENAME) hash) \ { \ TYPENAME##Slot* slot; \ if (hash->slotFreeList) \ @@ -251,7 +251,7 @@ TYPENAME##Slot* TYPENAME##_allocSlot (TYPENAME* hash) \ return slot; \ } \ \ -deBool TYPENAME##_rehash (TYPENAME* hash, int newSlotTableSize) \ +deBool TYPENAME##_rehash (DE_PTR_TYPE(TYPENAME) hash, int newSlotTableSize) \ { \ DE_ASSERT(deIsPowerOfTwo32(newSlotTableSize) && newSlotTableSize > 0); \ if (newSlotTableSize > hash->slotTableSize) \ @@ -317,7 +317,7 @@ VALUETYPE* TYPENAME##_find (const TYPENAME* hash, KEYTYPE key) \ return DE_NULL; \ } \ \ -deBool TYPENAME##_insert (TYPENAME* hash, KEYTYPE key, VALUETYPE value) \ +deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) hash, KEYTYPE key, VALUETYPE value) \ { \ int slotNdx; \ TYPENAME##Slot* slot; \ @@ -364,7 +364,7 @@ deBool TYPENAME##_insert (TYPENAME* hash, KEYTYPE key, VALUETYPE value) \ } \ } \ \ -void TYPENAME##_delete (TYPENAME* hash, KEYTYPE key) \ +void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) hash, KEYTYPE key) \ { \ int slotNdx; \ TYPENAME##Slot* slot; \ @@ -421,11 +421,11 @@ struct TYPENAME##Dummy2_s { int dummy; } /* Copy-to-array templates. */ #define DE_DECLARE_POOL_HASH_TO_ARRAY(HASHTYPENAME, KEYARRAYTYPENAME, VALUEARRAYTYPENAME) \ - deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* set, KEYARRAYTYPENAME* keyArray, VALUEARRAYTYPENAME* valueArray); \ + deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* set, DE_PTR_TYPE(KEYARRAYTYPENAME) keyArray, DE_PTR_TYPE(VALUEARRAYTYPENAME) valueArray); \ struct HASHTYPENAME##_##KEYARRAYTYPENAME##_##VALUEARRAYTYPENAME##_declare_dummy { int dummy; } #define DE_IMPLEMENT_POOL_HASH_TO_ARRAY(HASHTYPENAME, KEYARRAYTYPENAME, VALUEARRAYTYPENAME) \ -deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* hash, KEYARRAYTYPENAME* keyArray, VALUEARRAYTYPENAME* valueArray) \ +deBool HASHTYPENAME##_copyToArray(const HASHTYPENAME* hash, DE_PTR_TYPE(KEYARRAYTYPENAME) keyArray, DE_PTR_TYPE(VALUEARRAYTYPENAME) valueArray) \ { \ int numElements = hash->numElements; \ int arrayNdx = 0; \ diff --git a/framework/delibs/depool/dePoolHashArray.h b/framework/delibs/depool/dePoolHashArray.h index 05df088..4be0cbf 100644 --- a/framework/delibs/depool/dePoolHashArray.h +++ b/framework/delibs/depool/dePoolHashArray.h @@ -65,15 +65,15 @@ typedef struct TYPENAME_s \ { \ TYPENAME##Hash* hash; \ TYPENAME##Array* array; \ -} TYPENAME; \ +} TYPENAME; /* NOLINT(TYPENAME) */ \ \ TYPENAME* TYPENAME##_create (deMemPool* pool); \ -deBool TYPENAME##_insert (TYPENAME* hashArray, KEYTYPE key, VALUETYPE value); \ -deBool TYPENAME##_copyToArray (const TYPENAME* hashArray, KEYARRAYTYPE* keys, VALUEARRAYTYPE* values); \ +deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) hashArray, KEYTYPE key, VALUETYPE value); \ +deBool TYPENAME##_copyToArray (const TYPENAME* hashArray, DE_PTR_TYPE(KEYARRAYTYPE) keys, DE_PTR_TYPE(VALUEARRAYTYPE) values); \ \ DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* hashArray) DE_UNUSED_FUNCTION; \ DE_INLINE VALUETYPE* TYPENAME##_find (const TYPENAME* hashArray, KEYTYPE key) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_reset (TYPENAME* hashArray) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) hashArray) DE_UNUSED_FUNCTION; \ \ DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* hashArray) \ { \ @@ -97,7 +97,7 @@ DE_INLINE VALUETYPE* TYPENAME##_find (const TYPENAME* hashArray, KEYTYPE key) } \ } \ \ -DE_INLINE void TYPENAME##_reset (TYPENAME* hashArray) \ +DE_INLINE void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) hashArray) \ { \ TYPENAME##Hash_reset(hashArray->hash); \ TYPENAME##Array_reset(hashArray->array); \ @@ -126,7 +126,7 @@ DE_IMPLEMENT_POOL_HASH(TYPENAME##Hash, KEYTYPE, int, KEYHASHFUNC, KEYCMPFUNC); \ TYPENAME* TYPENAME##_create (deMemPool* pool) \ { \ - TYPENAME* hashArray = DE_POOL_NEW(pool, TYPENAME); \ + DE_PTR_TYPE(TYPENAME) hashArray = DE_POOL_NEW(pool, TYPENAME); \ if (!hashArray) return DE_NULL; \ if ((hashArray->hash = TYPENAME##Hash_create(pool)) == DE_NULL) \ return DE_NULL; \ @@ -135,7 +135,7 @@ TYPENAME* TYPENAME##_create (deMemPool* pool) \ return hashArray; \ } \ \ -deBool TYPENAME##_insert (TYPENAME* hashArray, KEYTYPE key, VALUETYPE value) \ +deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) hashArray, KEYTYPE key, VALUETYPE value) \ { \ int numElements = TYPENAME##Array_getNumElements(hashArray->array); \ DE_ASSERT(TYPENAME##Hash_getNumElements(hashArray->hash) == numElements); \ @@ -147,7 +147,7 @@ deBool TYPENAME##_insert (TYPENAME* hashArray, KEYTYPE key, VALUETYPE value) return DE_TRUE; \ } \ \ -deBool TYPENAME##_copyToArray (const TYPENAME* hashArray, KEYARRAYTYPE* keys, VALUEARRAYTYPE* values) \ +deBool TYPENAME##_copyToArray (const TYPENAME* hashArray, DE_PTR_TYPE(KEYARRAYTYPE) keys, DE_PTR_TYPE(VALUEARRAYTYPE) values) \ { \ int numElements = TYPENAME##Array_getNumElements(hashArray->array); \ TYPENAME##Hash* hash = hashArray->hash; \ diff --git a/framework/delibs/depool/dePoolHashSet.h b/framework/delibs/depool/dePoolHashSet.h index b4669ce..4a96862 100644 --- a/framework/delibs/depool/dePoolHashSet.h +++ b/framework/delibs/depool/dePoolHashSet.h @@ -61,20 +61,20 @@ DE_DECLARE_POOL_HASH(TYPENAME##Hash, KEYTYPE, TYPENAME##Set*); \ typedef struct TYPENAME##_s \ { \ TYPENAME##Hash* hash; \ -} TYPENAME; \ +} TYPENAME; /* NOLINT(TYPENAME) */ \ \ DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool); \ -DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* hashSet) DE_UNUSED_FUNCTION; \ -DE_INLINE TYPENAME##Hash* TYPENAME##_getHash (const TYPENAME* hashSet) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_insert (TYPENAME* hashSet, KEYTYPE key, VALUETYPE value) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_safeInsert (TYPENAME* hashSet, KEYTYPE key, VALUETYPE value) DE_UNUSED_FUNCTION; \ -DE_INLINE TYPENAME##Set* TYPENAME##_find (const TYPENAME* hashSet, KEYTYPE key) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_delete (TYPENAME* hashSet, KEYTYPE key, VALUETYPE value) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_exists (const TYPENAME* hashSet, KEYTYPE key, VALUETYPE value) DE_UNUSED_FUNCTION; \ +DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* hashSet) DE_UNUSED_FUNCTION; \ +DE_INLINE TYPENAME##Hash* TYPENAME##_getHash (const TYPENAME* hashSet) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_safeInsert (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value) DE_UNUSED_FUNCTION; \ +DE_INLINE TYPENAME##Set* TYPENAME##_find (const TYPENAME* hashSet, KEYTYPE key) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_exists (const TYPENAME* hashSet, KEYTYPE key, VALUETYPE value) DE_UNUSED_FUNCTION; \ \ DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool) \ { \ - TYPENAME* hashSet = DE_POOL_NEW(pool, TYPENAME); \ + DE_PTR_TYPE(TYPENAME) hashSet = DE_POOL_NEW(pool, TYPENAME); \ if (!hashSet) return DE_NULL; \ if ((hashSet->hash = TYPENAME##Hash_create(pool)) == DE_NULL) \ return DE_NULL; \ @@ -91,7 +91,7 @@ DE_INLINE TYPENAME##Hash* TYPENAME##_getHash (const TYPENAME* hashSet) \ return hashSet->hash; \ } \ \ -DE_INLINE deBool TYPENAME##_insert (TYPENAME* hashSet, KEYTYPE key, VALUETYPE value) \ +DE_INLINE deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value) \ { \ TYPENAME##Set** setPtr = TYPENAME##Hash_find(hashSet->hash, key); \ TYPENAME##Set* set = setPtr ? *setPtr : DE_NULL; \ @@ -108,7 +108,7 @@ DE_INLINE deBool TYPENAME##_insert (TYPENAME* hashSet, KEYTYPE key, VALUETYPE va } \ } \ \ -DE_INLINE deBool TYPENAME##_safeInsert (TYPENAME* hashSet, KEYTYPE key, VALUETYPE value) \ +DE_INLINE deBool TYPENAME##_safeInsert (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value)\ { \ TYPENAME##Set** setPtr = TYPENAME##Hash_find(hashSet->hash, key); \ TYPENAME##Set* set = setPtr ? *setPtr : DE_NULL; \ @@ -128,7 +128,7 @@ DE_INLINE TYPENAME##Set* TYPENAME##_find (const TYPENAME* hashSet, KEYTYPE key) return setPtr ? *setPtr : DE_NULL; \ } \ \ -DE_INLINE void TYPENAME##_delete (TYPENAME* hashSet, KEYTYPE key, VALUETYPE value) \ +DE_INLINE void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) hashSet, KEYTYPE key, VALUETYPE value) \ { \ TYPENAME##Set** setPtr = TYPENAME##Hash_find(hashSet->hash, key); \ TYPENAME##Set* set; \ diff --git a/framework/delibs/depool/dePoolHeap.h b/framework/delibs/depool/dePoolHeap.h index 04a253f..a61b83e 100644 --- a/framework/delibs/depool/dePoolHeap.h +++ b/framework/delibs/depool/dePoolHeap.h @@ -61,20 +61,20 @@ DE_DECLARE_POOL_ARRAY(TYPENAME##Array, VALUETYPE); \ typedef struct TYPENAME##_s \ { \ TYPENAME##Array* array; \ -} TYPENAME; \ +} TYPENAME; /* NOLINT(TYPENAME) */ \ \ -DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool); \ -DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* heap) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_reserve (TYPENAME* heap, int capacity) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_reset (TYPENAME* heap) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_moveDown (TYPENAME* heap, int ndx) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_moveUp (TYPENAME* heap, int ndx) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_push (TYPENAME* heap, VALUETYPE elem) DE_UNUSED_FUNCTION; \ -DE_INLINE VALUETYPE TYPENAME##_popMin (TYPENAME* heap) DE_UNUSED_FUNCTION; \ +DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool); \ +DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* heap) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_reserve (DE_PTR_TYPE(TYPENAME) heap, int capacity) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) heap) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_moveDown (DE_PTR_TYPE(TYPENAME) heap, int ndx) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_moveUp (DE_PTR_TYPE(TYPENAME) heap, int ndx) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_push (DE_PTR_TYPE(TYPENAME) heap, VALUETYPE elem) DE_UNUSED_FUNCTION; \ +DE_INLINE VALUETYPE TYPENAME##_popMin (DE_PTR_TYPE(TYPENAME) heap) DE_UNUSED_FUNCTION; \ \ DE_INLINE TYPENAME* TYPENAME##_create (deMemPool* pool) \ { \ - TYPENAME* heap = DE_POOL_NEW(pool, TYPENAME); \ + DE_PTR_TYPE(TYPENAME) heap = DE_POOL_NEW(pool, TYPENAME); \ if (!heap) \ return DE_NULL; \ heap->array = TYPENAME##Array_create(pool); \ @@ -88,17 +88,17 @@ DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* heap) \ return TYPENAME##Array_getNumElements(heap->array); \ } \ \ -DE_INLINE deBool TYPENAME##_reserve (TYPENAME* heap, int capacity) \ +DE_INLINE deBool TYPENAME##_reserve (DE_PTR_TYPE(TYPENAME) heap, int capacity) \ { \ return TYPENAME##Array_reserve(heap->array, capacity); \ } \ \ -DE_INLINE void TYPENAME##_reset (TYPENAME* heap) \ +DE_INLINE void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) heap) \ { \ TYPENAME##Array_setSize(heap->array, 0); \ } \ \ -DE_INLINE void TYPENAME##_moveDown (TYPENAME* heap, int ndx) \ +DE_INLINE void TYPENAME##_moveDown (DE_PTR_TYPE(TYPENAME) heap, int ndx) \ { \ TYPENAME##Array* array = heap->array; \ int numElements = TYPENAME##Array_getNumElements(array); \ @@ -124,7 +124,7 @@ DE_INLINE void TYPENAME##_moveDown (TYPENAME* heap, int ndx) \ } \ } \ \ -DE_INLINE void TYPENAME##_moveUp (TYPENAME* heap, int ndx) \ +DE_INLINE void TYPENAME##_moveUp (DE_PTR_TYPE(TYPENAME) heap, int ndx) \ { \ TYPENAME##Array* array = heap->array; \ while (ndx > 0) \ @@ -141,7 +141,7 @@ DE_INLINE void TYPENAME##_moveUp (TYPENAME* heap, int ndx) \ } \ } \ \ -DE_INLINE deBool TYPENAME##_push (TYPENAME* heap, VALUETYPE elem) \ +DE_INLINE deBool TYPENAME##_push (DE_PTR_TYPE(TYPENAME) heap, VALUETYPE elem) \ { \ TYPENAME##Array* array = heap->array; \ int numElements = TYPENAME##Array_getNumElements(array); \ @@ -152,7 +152,7 @@ DE_INLINE deBool TYPENAME##_push (TYPENAME* heap, VALUETYPE elem) \ return DE_TRUE; \ } \ \ -DE_INLINE VALUETYPE TYPENAME##_popMin (TYPENAME* heap) \ +DE_INLINE VALUETYPE TYPENAME##_popMin (DE_PTR_TYPE(TYPENAME) heap) \ { \ TYPENAME##Array* array = heap->array; \ VALUETYPE tmp = TYPENAME##Array_get(array, 0); \ diff --git a/framework/delibs/depool/dePoolMultiSet.h b/framework/delibs/depool/dePoolMultiSet.h index 30d17d9..ac6c3f7 100644 --- a/framework/delibs/depool/dePoolMultiSet.h +++ b/framework/delibs/depool/dePoolMultiSet.h @@ -62,16 +62,16 @@ DE_END_EXTERN_C \ DE_DECLARE_POOL_HASH(TYPENAME##Hash, KEYTYPE, int); \ \ -typedef struct TYPENAME##_s \ -{ \ - deMemPool* pool; \ +typedef struct TYPENAME##_s \ +{ \ + deMemPool* pool; \ int numElements; \ - TYPENAME##Hash* hash; \ -} TYPENAME; \ + TYPENAME##Hash* hash; \ +} TYPENAME; /* NOLINT(TYPENAME) */ \ \ TYPENAME* TYPENAME##_create (deMemPool* pool); \ -void TYPENAME##_reset (TYPENAME* set); \ -deBool TYPENAME##_setKeyCount (TYPENAME* set, KEYTYPE key, int newCount); \ +void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) set); \ +deBool TYPENAME##_setKeyCount (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key, int newCount); \ \ DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* set) \ { \ @@ -91,13 +91,13 @@ DE_INLINE deBool TYPENAME##_exists (const TYPENAME* set, KEYTYPE key) \ return (TYPENAME##_getKeyCount(set, key) > 0); \ } \ \ -DE_INLINE deBool TYPENAME##_insert (TYPENAME* set, KEYTYPE key) \ +DE_INLINE deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ { \ int oldCount = TYPENAME##_getKeyCount(set, key); \ return TYPENAME##_setKeyCount(set, key, oldCount + 1); \ } \ \ -DE_INLINE void TYPENAME##_delete (TYPENAME* set, KEYTYPE key) \ +DE_INLINE void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ { \ int oldCount = TYPENAME##_getKeyCount(set, key); \ DE_ASSERT(oldCount > 0); \ @@ -125,7 +125,7 @@ DE_IMPLEMENT_POOL_HASH(TYPENAME##Hash, KEYTYPE, int, HASHFUNC, CMPFUNC); \ TYPENAME* TYPENAME##_create (deMemPool* pool) \ { \ /* Alloc struct. */ \ - TYPENAME* set = DE_POOL_NEW(pool, TYPENAME); \ + DE_PTR_TYPE(TYPENAME) set = DE_POOL_NEW(pool, TYPENAME); \ if (!set) \ return DE_NULL; \ \ @@ -138,13 +138,13 @@ TYPENAME* TYPENAME##_create (deMemPool* pool) \ return set; \ } \ \ -void TYPENAME##_reset (TYPENAME* set) \ +void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) set) \ { \ TYPENAME##Hash_reset(set->hash); \ set->numElements = 0; \ } \ \ -deBool TYPENAME##_setKeyCount (TYPENAME* set, KEYTYPE key, int newCount) \ +deBool TYPENAME##_setKeyCount (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key, int newCount) \ { \ int* countPtr = TYPENAME##Hash_find(set->hash, key); \ int oldCount = countPtr ? *countPtr : 0; \ @@ -188,25 +188,25 @@ struct TYPENAME##ImplementDummy_s { int dummy; } * void MultiSet_differenceInplace (Set* a, const Set* b); * \endcode *//*--------------------------------------------------------------------*/ -#define DE_DECLARE_POOL_MULTISET_SETWISE_OPERATIONS(TYPENAME) \ - deBool TYPENAME##_union (TYPENAME* to, const TYPENAME* a, const TYPENAME* b); \ - deBool TYPENAME##_unionInplace (TYPENAME* a, const TYPENAME* b); \ - deBool TYPENAME##_intersect (TYPENAME* to, const TYPENAME* a, const TYPENAME* b); \ - void TYPENAME##_intersectInplace (TYPENAME* a, const TYPENAME* b); \ - deBool TYPENAME##_sum (TYPENAME* to, const TYPENAME* a, const TYPENAME* b); \ - deBool TYPENAME##_sumInplace (TYPENAME* a, const TYPENAME* b); \ - deBool TYPENAME##_difference (TYPENAME* to, const TYPENAME* a, const TYPENAME* b); \ - void TYPENAME##_differenceInplace (TYPENAME* a, const TYPENAME* b); \ +#define DE_DECLARE_POOL_MULTISET_SETWISE_OPERATIONS(TYPENAME) \ + deBool TYPENAME##_union (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ + deBool TYPENAME##_unionInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ + deBool TYPENAME##_intersect (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ + void TYPENAME##_intersectInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ + deBool TYPENAME##_sum (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ + deBool TYPENAME##_sumInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ + deBool TYPENAME##_difference (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ + void TYPENAME##_differenceInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ struct TYPENAME##SetwiseDeclareDummy_s { int dummy; } #define DE_IMPLEMENT_POOL_MULTISET_SETWISE_OPERATIONS(TYPENAME, KEYTYPE) \ -deBool TYPENAME##_union (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_union (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ { \ TYPENAME##_reset(to); \ return TYPENAME##_unionInplace(to, a) && TYPENAME##_unionInplace(to, b); \ } \ \ -deBool TYPENAME##_unionInplace (TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_unionInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ { \ TYPENAME##HashIter iter; \ for (TYPENAME##HashIter_init(b, &iter); \ @@ -223,7 +223,7 @@ deBool TYPENAME##_unionInplace (TYPENAME* a, const TYPENAME* b) \ return DE_TRUE; \ } \ \ -deBool TYPENAME##_intersect (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_intersect (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ { \ TYPENAME##HashIter iter; \ TYPENAME##_reset(to); \ @@ -241,18 +241,18 @@ deBool TYPENAME##_intersect (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) return DE_TRUE; \ } \ \ -void TYPENAME##_intersectInplace (TYPENAME* a, const TYPENAME* b) \ +void TYPENAME##_intersectInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ { \ DE_FATAL("Not implemented."); \ } \ \ -deBool TYPENAME##_sum (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_sum (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ { \ TYPENAME##_reset(to); \ return TYPENAME##_sumInplace(to, a) && TYPENAME##_sumInplace(to, b); \ } \ \ -deBool TYPENAME##_sumInplace (TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_sumInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ { \ TYPENAME##HashIter iter; \ for (TYPENAME##HashIter_init(b, &iter); \ @@ -268,7 +268,7 @@ deBool TYPENAME##_sumInplace (TYPENAME* a, const TYPENAME* b) \ } \ } \ \ -deBool TYPENAME##_difference (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_difference (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ { \ TYPENAME##HashIter iter; \ TYPENAME##_reset(to); \ @@ -286,7 +286,7 @@ deBool TYPENAME##_difference (TYPENAME* to, const TYPENAME* a, const TYPENAME* b return DE_TRUE; \ } \ \ -void TYPENAME##_differenceInplace (TYPENAME* a, const TYPENAME* b) \ +void TYPENAME##_differenceInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ { \ DE_FATAL("Not implemented."); \ } \ diff --git a/framework/delibs/depool/dePoolSet.h b/framework/delibs/depool/dePoolSet.h index 52f29bb..dfc32e8 100644 --- a/framework/delibs/depool/dePoolSet.h +++ b/framework/delibs/depool/dePoolSet.h @@ -74,15 +74,15 @@ struct TYPENAME##Slot_s \ KEYTYPE keys[DE_SET_ELEMENTS_PER_SLOT]; \ }; \ \ -typedef struct TYPENAME##_s \ -{ \ - deMemPool* pool; \ +typedef struct TYPENAME##_s \ +{ \ + deMemPool* pool; \ int numElements; \ -\ - int slotTableSize; \ + \ + int slotTableSize; \ TYPENAME##Slot** slotTable; \ - TYPENAME##Slot* slotFreeList; \ -} TYPENAME; \ + TYPENAME##Slot* slotFreeList; \ +} TYPENAME; /* NOLINT(TYPENAME) */ \ \ typedef struct TYPENAME##Iter_s \ { \ @@ -92,20 +92,20 @@ typedef struct TYPENAME##Iter_s \ int curElemIndex; \ } TYPENAME##Iter; \ \ -TYPENAME* TYPENAME##_create (deMemPool* pool); \ -void TYPENAME##_reset (TYPENAME* set); \ -deBool TYPENAME##_reserve (TYPENAME* set, int capacity); \ -deBool TYPENAME##_exists (const TYPENAME* set, KEYTYPE key); \ -deBool TYPENAME##_insert (TYPENAME* set, KEYTYPE key); \ -void TYPENAME##_delete (TYPENAME* set, KEYTYPE key); \ +TYPENAME* TYPENAME##_create (deMemPool* pool); \ +void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) set); \ +deBool TYPENAME##_reserve (DE_PTR_TYPE(TYPENAME) set, int capacity); \ +deBool TYPENAME##_exists (const TYPENAME* set, KEYTYPE key); \ +deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key); \ +void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key); \ \ DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* set) DE_UNUSED_FUNCTION; \ DE_INLINE void TYPENAME##Iter_init (const TYPENAME* hash, TYPENAME##Iter* iter) DE_UNUSED_FUNCTION; \ DE_INLINE deBool TYPENAME##Iter_hasItem (const TYPENAME##Iter* iter) DE_UNUSED_FUNCTION; \ DE_INLINE void TYPENAME##Iter_next (TYPENAME##Iter* iter) DE_UNUSED_FUNCTION; \ DE_INLINE KEYTYPE TYPENAME##Iter_getKey (const TYPENAME##Iter* iter) DE_UNUSED_FUNCTION; \ -DE_INLINE deBool TYPENAME##_safeInsert (TYPENAME* set, KEYTYPE key) DE_UNUSED_FUNCTION; \ -DE_INLINE void TYPENAME##_safeDelete (TYPENAME* set, KEYTYPE key) DE_UNUSED_FUNCTION; \ +DE_INLINE deBool TYPENAME##_safeInsert (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) DE_UNUSED_FUNCTION; \ +DE_INLINE void TYPENAME##_safeDelete (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) DE_UNUSED_FUNCTION; \ \ DE_INLINE int TYPENAME##_getNumElements (const TYPENAME* set) \ { \ @@ -175,7 +175,7 @@ DE_INLINE KEYTYPE TYPENAME##Iter_getKey (const TYPENAME##Iter* iter) \ return iter->curSlot->keys[iter->curElemIndex]; \ } \ \ -DE_INLINE deBool TYPENAME##_safeInsert (TYPENAME* set, KEYTYPE key) \ +DE_INLINE deBool TYPENAME##_safeInsert (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ { \ DE_ASSERT(set); \ if (TYPENAME##_exists(set, key)) \ @@ -183,7 +183,7 @@ DE_INLINE deBool TYPENAME##_safeInsert (TYPENAME* set, KEYTYPE key) \ return TYPENAME##_insert(set, key); \ } \ \ -DE_INLINE void TYPENAME##_safeDelete (TYPENAME* set, KEYTYPE key) \ +DE_INLINE void TYPENAME##_safeDelete (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ { \ DE_ASSERT(set); \ if (TYPENAME##_exists(set, key)) \ @@ -206,10 +206,10 @@ struct TYPENAME##Dummy_s { int dummy; } *//*--------------------------------------------------------------------*/ #define DE_IMPLEMENT_POOL_SET(TYPENAME, KEYTYPE, HASHFUNC, CMPFUNC) \ \ -TYPENAME* TYPENAME##_create (deMemPool* pool) \ +DE_PTR_TYPE(TYPENAME) TYPENAME##_create (deMemPool* pool) \ { \ /* Alloc struct. */ \ - TYPENAME* set = DE_POOL_NEW(pool, TYPENAME); \ + DE_PTR_TYPE(TYPENAME) set = DE_POOL_NEW(pool, TYPENAME); \ if (!set) \ return DE_NULL; \ \ @@ -220,7 +220,7 @@ TYPENAME* TYPENAME##_create (deMemPool* pool) \ return set; \ } \ \ -void TYPENAME##_reset (TYPENAME* set) \ +void TYPENAME##_reset (DE_PTR_TYPE(TYPENAME) set) \ { \ int slotNdx; \ for (slotNdx = 0; slotNdx < set->slotTableSize; slotNdx++) \ @@ -239,7 +239,7 @@ void TYPENAME##_reset (TYPENAME* set) \ set->numElements = 0; \ } \ \ -TYPENAME##Slot* TYPENAME##_allocSlot (TYPENAME* set) \ +TYPENAME##Slot* TYPENAME##_allocSlot (DE_PTR_TYPE(TYPENAME) set) \ { \ TYPENAME##Slot* slot; \ if (set->slotFreeList) \ @@ -259,7 +259,7 @@ TYPENAME##Slot* TYPENAME##_allocSlot (TYPENAME* set) \ return slot; \ } \ \ -deBool TYPENAME##_rehash (TYPENAME* set, int newSlotTableSize) \ +deBool TYPENAME##_rehash (DE_PTR_TYPE(TYPENAME) set, int newSlotTableSize) \ { \ DE_ASSERT(deIsPowerOfTwo32(newSlotTableSize) && newSlotTableSize > 0); \ if (newSlotTableSize > set->slotTableSize) \ @@ -325,7 +325,7 @@ deBool TYPENAME##_exists (const TYPENAME* set, KEYTYPE key) \ return DE_FALSE; \ } \ \ -deBool TYPENAME##_insert (TYPENAME* set, KEYTYPE key) \ +deBool TYPENAME##_insert (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ { \ int slotNdx; \ TYPENAME##Slot* slot; \ @@ -372,7 +372,7 @@ deBool TYPENAME##_insert (TYPENAME* set, KEYTYPE key) \ } \ } \ \ -void TYPENAME##_delete (TYPENAME* set, KEYTYPE key) \ +void TYPENAME##_delete (DE_PTR_TYPE(TYPENAME) set, KEYTYPE key) \ { \ int slotNdx; \ TYPENAME##Slot* slot; \ @@ -429,11 +429,11 @@ struct TYPENAME##Dummy2_s { int dummy; } /* Copy-to-array templates. */ #define DE_DECLARE_POOL_SET_TO_ARRAY(SETTYPENAME, ARRAYTYPENAME) \ - deBool SETTYPENAME##_copyToArray(const SETTYPENAME* set, ARRAYTYPENAME* array); \ + deBool SETTYPENAME##_copyToArray(const SETTYPENAME* set, DE_PTR_TYPE(ARRAYTYPENAME) array); \ struct SETTYPENAME##_##ARRAYTYPENAME##_declare_dummy { int dummy; } #define DE_IMPLEMENT_POOL_SET_TO_ARRAY(SETTYPENAME, ARRAYTYPENAME) \ - deBool SETTYPENAME##_copyToArray(const SETTYPENAME* set, ARRAYTYPENAME* array) \ + deBool SETTYPENAME##_copyToArray(const SETTYPENAME* set, DE_PTR_TYPE(ARRAYTYPENAME) array) \ { \ int numElements = set->numElements; \ int arrayNdx = 0; \ @@ -480,17 +480,17 @@ struct TYPENAME##Dummy2_s { int dummy; } * void Set_differenceInplace (Set* a, const Set* b); * \endcode *//*--------------------------------------------------------------------*/ -#define DE_DECLARE_POOL_SET_SETWISE_OPERATIONS(TYPENAME) \ - deBool TYPENAME##_union (TYPENAME* to, const TYPENAME* a, const TYPENAME* b); \ - deBool TYPENAME##_unionInplace (TYPENAME* a, const TYPENAME* b); \ - deBool TYPENAME##_intersect (TYPENAME* to, const TYPENAME* a, const TYPENAME* b); \ - void TYPENAME##_intersectInplace (TYPENAME* a, const TYPENAME* b); \ - deBool TYPENAME##_difference (TYPENAME* to, const TYPENAME* a, const TYPENAME* b); \ - void TYPENAME##_differenceInplace (TYPENAME* a, const TYPENAME* b); \ +#define DE_DECLARE_POOL_SET_SETWISE_OPERATIONS(TYPENAME) \ + deBool TYPENAME##_union (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ + deBool TYPENAME##_unionInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ + deBool TYPENAME##_intersect (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ + void TYPENAME##_intersectInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ + deBool TYPENAME##_difference (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b); \ + void TYPENAME##_differenceInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b); \ struct TYPENAME##SetwiseDeclareDummy_s { int dummy; } #define DE_IMPLEMENT_POOL_SET_SETWISE_OPERATIONS(TYPENAME, KEYTYPE) \ -deBool TYPENAME##_union (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_union (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ { \ TYPENAME##_reset(to); \ if (!TYPENAME##_unionInplace(to, a)) \ @@ -500,7 +500,7 @@ deBool TYPENAME##_union (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) \ return DE_TRUE; \ } \ \ -deBool TYPENAME##_unionInplace (TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_unionInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ { \ TYPENAME##Iter iter; \ for (TYPENAME##Iter_init(b, &iter); \ @@ -517,7 +517,7 @@ deBool TYPENAME##_unionInplace (TYPENAME* a, const TYPENAME* b) \ return DE_TRUE; \ } \ \ -deBool TYPENAME##_intersect (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_intersect (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ { \ TYPENAME##Iter iter; \ TYPENAME##_reset(to); \ @@ -535,13 +535,13 @@ deBool TYPENAME##_intersect (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) return DE_TRUE; \ } \ \ -void TYPENAME##_intersectInplace (TYPENAME* a, const TYPENAME* b) \ +void TYPENAME##_intersectInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ { \ DE_UNREF(a && b); \ DE_FATAL("Not implemented."); \ } \ \ -deBool TYPENAME##_difference (TYPENAME* to, const TYPENAME* a, const TYPENAME* b) \ +deBool TYPENAME##_difference (DE_PTR_TYPE(TYPENAME) to, const TYPENAME* a, const TYPENAME* b) \ { \ TYPENAME##Iter iter; \ TYPENAME##_reset(to); \ @@ -559,7 +559,7 @@ deBool TYPENAME##_difference (TYPENAME* to, const TYPENAME* a, const TYPENAME* b return DE_TRUE; \ } \ \ -void TYPENAME##_differenceInplace (TYPENAME* a, const TYPENAME* b) \ +void TYPENAME##_differenceInplace (DE_PTR_TYPE(TYPENAME) a, const TYPENAME* b) \ { \ TYPENAME##Iter iter; \ for (TYPENAME##Iter_init(b, &iter); \ diff --git a/framework/delibs/deutil/deSocket.c b/framework/delibs/deutil/deSocket.c index ce8a1dd..eee0bc0 100644 --- a/framework/delibs/deutil/deSocket.c +++ b/framework/delibs/deutil/deSocket.c @@ -197,7 +197,7 @@ static deBool initWinsock (void) typedef int deSocketHandle; typedef socklen_t NativeSocklen; typedef size_t NativeSize; -# define DE_INVALID_SOCKET_HANDLE -1 +# define DE_INVALID_SOCKET_HANDLE (-1) #endif DE_INLINE deBool deSocketHandleIsValid (deSocketHandle handle) diff --git a/modules/egl/teglApiCase.hpp b/modules/egl/teglApiCase.hpp index 9bc1176..b13e0ac 100644 --- a/modules/egl/teglApiCase.hpp +++ b/modules/egl/teglApiCase.hpp @@ -81,7 +81,7 @@ private: public: \ ApiCase_##NAME (EglTestContext& context) : ApiCase(context, #NAME, DESCRIPTION) {} \ protected: \ - void test (void) TEST_FUNC_BODY \ + void test (void) TEST_FUNC_BODY /* NOLINT(TEST_FUNC_BODY) */ \ }; \ addChild(new ApiCase_##NAME(m_eglTestCtx)); \ } while (deGetFalse()) diff --git a/modules/egl/teglImageTests.cpp b/modules/egl/teglImageTests.cpp index 1f48124..d99d504 100644 --- a/modules/egl/teglImageTests.cpp +++ b/modules/egl/teglImageTests.cpp @@ -88,7 +88,7 @@ namespace Image { #define CHECK_EXTENSION(DPY, EXTNAME) \ - TCU_CHECK_AND_THROW(NotSupportedError, eglu::hasExtension(m_eglTestCtx.getLibrary(), DPY, EXTNAME), (string("Unsupported extension: ") + EXTNAME).c_str()) + TCU_CHECK_AND_THROW(NotSupportedError, eglu::hasExtension(m_eglTestCtx.getLibrary(), DPY, EXTNAME), (string("Unsupported extension: ") + (EXTNAME)).c_str()) template RetVal checkCallError (EglTestContext& eglTestCtx, const char* call, RetVal returnValue, EGLint expectError) diff --git a/modules/gles2/accuracy/es2aTextureFilteringTests.cpp b/modules/gles2/accuracy/es2aTextureFilteringTests.cpp index 03d7689..6faaa29 100644 --- a/modules/gles2/accuracy/es2aTextureFilteringTests.cpp +++ b/modules/gles2/accuracy/es2aTextureFilteringTests.cpp @@ -708,7 +708,7 @@ void TextureFilteringTests::init (void) }; #define FOR_EACH(ITERATOR, ARRAY, BODY) \ - for (int ITERATOR = 0; ITERATOR < DE_LENGTH_OF_ARRAY(ARRAY); ITERATOR++) \ + for (int (ITERATOR) = 0; (ITERATOR) < DE_LENGTH_OF_ARRAY(ARRAY); (ITERATOR)++) \ BODY // 2D cases. diff --git a/modules/gles2/functional/es2fApiCase.hpp b/modules/gles2/functional/es2fApiCase.hpp index fee6e8e..d213aa5 100644 --- a/modules/gles2/functional/es2fApiCase.hpp +++ b/modules/gles2/functional/es2fApiCase.hpp @@ -62,7 +62,7 @@ protected: public: \ ApiCase_##NAME (Context& context) : ApiCase(context, #NAME, DESCRIPTION) {} \ protected: \ - void test (void) TEST_FUNC_BODY \ + void test (void) TEST_FUNC_BODY /* NOLINT(TEST_FUNC_BODY) */ \ }; \ addChild(new ApiCase_##NAME(m_context)); \ } while (deGetFalse()) diff --git a/modules/gles2/functional/es2fBooleanStateQueryTests.cpp b/modules/gles2/functional/es2fBooleanStateQueryTests.cpp index 67c8406..8d27a43 100644 --- a/modules/gles2/functional/es2fBooleanStateQueryTests.cpp +++ b/modules/gles2/functional/es2fBooleanStateQueryTests.cpp @@ -528,7 +528,7 @@ private: #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - StateVerifier* verifier = VERIFIERS[_verifierNdx]; \ + StateVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles2/functional/es2fBufferObjectQueryTests.cpp b/modules/gles2/functional/es2fBufferObjectQueryTests.cpp index 7995ac2..8812db0 100644 --- a/modules/gles2/functional/es2fBufferObjectQueryTests.cpp +++ b/modules/gles2/functional/es2fBufferObjectQueryTests.cpp @@ -240,7 +240,7 @@ public: #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - BufferParamVerifier* verifier = VERIFIERS[_verifierNdx]; \ + BufferParamVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles2/functional/es2fDefaultVertexAttributeTests.cpp b/modules/gles2/functional/es2fDefaultVertexAttributeTests.cpp index 30379f8..b6c44d7 100644 --- a/modules/gles2/functional/es2fDefaultVertexAttributeTests.cpp +++ b/modules/gles2/functional/es2fDefaultVertexAttributeTests.cpp @@ -92,7 +92,7 @@ public: }; \ enum \ { \ - COMPONENTS = COMPS \ + COMPONENTS = (COMPS) \ }; \ typedef TYPE Type; \ \ @@ -126,7 +126,7 @@ public: }; \ enum \ { \ - COMPONENTS = COMPS \ + COMPONENTS = (COMPS) \ }; \ typedef TYPE Type; \ \ diff --git a/modules/gles2/functional/es2fFloatStateQueryTests.cpp b/modules/gles2/functional/es2fFloatStateQueryTests.cpp index 32c6439..eb51dce 100644 --- a/modules/gles2/functional/es2fFloatStateQueryTests.cpp +++ b/modules/gles2/functional/es2fFloatStateQueryTests.cpp @@ -1094,7 +1094,7 @@ private: #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - StateVerifier* verifier = VERIFIERS[_verifierNdx]; \ + StateVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles2/functional/es2fIntegerStateQueryTests.cpp b/modules/gles2/functional/es2fIntegerStateQueryTests.cpp index 9e875a1..245cf21 100644 --- a/modules/gles2/functional/es2fIntegerStateQueryTests.cpp +++ b/modules/gles2/functional/es2fIntegerStateQueryTests.cpp @@ -1999,14 +1999,14 @@ static const char* getQueryTypeSuffix (QueryType type) #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - StateVerifier* verifier = VERIFIERS[_verifierNdx]; \ + StateVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } #define FOR_EACH_QUERYTYPE(QUERYTYPES, CODE_BLOCK) \ for (int _queryTypeNdx = 0; _queryTypeNdx < DE_LENGTH_OF_ARRAY(QUERYTYPES); _queryTypeNdx++) \ { \ - const QueryType queryType = QUERYTYPES[_queryTypeNdx]; \ + const QueryType queryType = (QUERYTYPES)[_queryTypeNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles2/functional/es2fShaderAlgorithmTests.cpp b/modules/gles2/functional/es2fShaderAlgorithmTests.cpp index 162aa2a..52e019c 100644 --- a/modules/gles2/functional/es2fShaderAlgorithmTests.cpp +++ b/modules/gles2/functional/es2fShaderAlgorithmTests.cpp @@ -154,7 +154,7 @@ void ShaderAlgorithmTests::init (void) #define SHADER_OP_CASE(NAME, DESCRIPTION, SHADER_OP, EVAL_FUNC_BODY) \ do { \ - struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; \ + struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; /* NOLINT(EVAL_FUNC_BODY) */ \ addChild(createExpressionCase(m_context, #NAME "_vertex", DESCRIPTION, true, &Eval_##NAME::eval, SHADER_OP)); \ addChild(createExpressionCase(m_context, #NAME "_fragment", DESCRIPTION, false, &Eval_##NAME::eval, SHADER_OP)); \ } while (deGetFalse()) diff --git a/modules/gles2/functional/es2fShaderStructTests.cpp b/modules/gles2/functional/es2fShaderStructTests.cpp index fb6f2ed..09edf66 100644 --- a/modules/gles2/functional/es2fShaderStructTests.cpp +++ b/modules/gles2/functional/es2fShaderStructTests.cpp @@ -211,7 +211,7 @@ void LocalStructTests::init (void) { #define LOCAL_STRUCT_CASE(NAME, DESCRIPTION, FLAGS, SHADER_SRC, EVAL_FUNC_BODY) \ do { \ - struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; \ + struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; /* NOLINT(EVAL_FUNC_BODY) */ \ addChild(createStructCase(m_context, #NAME "_vertex", DESCRIPTION, true, FLAGS, &Eval_##NAME::eval, DE_NULL, SHADER_SRC)); \ addChild(createStructCase(m_context, #NAME "_fragment", DESCRIPTION, false, FLAGS,&Eval_##NAME::eval, DE_NULL, SHADER_SRC)); \ } while (deGetFalse()) @@ -1166,7 +1166,7 @@ public: namespace { -#define CHECK_SET_UNIFORM(NAME) GLU_EXPECT_NO_ERROR(gl.getError(), (string("Failed to set ") + NAME).c_str()) +#define CHECK_SET_UNIFORM(NAME) GLU_EXPECT_NO_ERROR(gl.getError(), (string("Failed to set ") + (NAME)).c_str()) #define MAKE_SET_VEC_UNIFORM(VECTYPE, SETUNIFORM) \ void setUniform (const glw::Functions& gl, deUint32 programID, const char* name, const tcu::VECTYPE& vec) \ @@ -1217,8 +1217,10 @@ void UniformStructTests::init (void) { #define UNIFORM_STRUCT_CASE(NAME, DESCRIPTION, FLAGS, SHADER_SRC, SET_UNIFORMS_BODY, EVAL_FUNC_BODY) \ do { \ - struct SetUniforms_##NAME { static void setUniforms (const glw::Functions& gl, deUint32 programID, const tcu::Vec4& constCoords) SET_UNIFORMS_BODY }; \ - struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; \ + struct SetUniforms_##NAME { \ + static void setUniforms (const glw::Functions& gl, deUint32 programID, const tcu::Vec4& constCoords) SET_UNIFORMS_BODY /* NOLINT(SET_UNIFORMS_BODY) */ \ + }; \ + struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; /* NOLINT(EVAL_FUNC_BODY) */ \ addChild(createStructCase(m_context, #NAME "_vertex", DESCRIPTION, true, FLAGS, Eval_##NAME::eval, SetUniforms_##NAME::setUniforms, SHADER_SRC)); \ addChild(createStructCase(m_context, #NAME "_fragment", DESCRIPTION, false, FLAGS, Eval_##NAME::eval, SetUniforms_##NAME::setUniforms, SHADER_SRC)); \ } while (deGetFalse()) diff --git a/modules/gles2/functional/es2fTextureFilteringTests.cpp b/modules/gles2/functional/es2fTextureFilteringTests.cpp index 64c61f5..0ba137a 100644 --- a/modules/gles2/functional/es2fTextureFilteringTests.cpp +++ b/modules/gles2/functional/es2fTextureFilteringTests.cpp @@ -693,7 +693,7 @@ void TextureFilteringTests::init (void) }; #define FOR_EACH(ITERATOR, ARRAY, BODY) \ - for (int ITERATOR = 0; ITERATOR < DE_LENGTH_OF_ARRAY(ARRAY); ITERATOR++) \ + for (int (ITERATOR) = 0; (ITERATOR) < DE_LENGTH_OF_ARRAY(ARRAY); (ITERATOR)++) \ BODY // 2D cases. diff --git a/modules/gles2/functional/es2fTextureStateQueryTests.cpp b/modules/gles2/functional/es2fTextureStateQueryTests.cpp index 4f66f40..f4b99f5 100644 --- a/modules/gles2/functional/es2fTextureStateQueryTests.cpp +++ b/modules/gles2/functional/es2fTextureStateQueryTests.cpp @@ -345,7 +345,7 @@ public: #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - TexParamVerifier* verifier = VERIFIERS[_verifierNdx]; \ + TexParamVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles2/functional/es2fTextureWrapTests.cpp b/modules/gles2/functional/es2fTextureWrapTests.cpp index 40ad350..ccf5f90 100644 --- a/modules/gles2/functional/es2fTextureWrapTests.cpp +++ b/modules/gles2/functional/es2fTextureWrapTests.cpp @@ -279,7 +279,7 @@ void TextureWrapTests::init (void) }; #define FOR_EACH(ITERATOR, ARRAY, BODY) \ - for (int ITERATOR = 0; ITERATOR < DE_LENGTH_OF_ARRAY(ARRAY); ITERATOR++) \ + for (int (ITERATOR) = 0; (ITERATOR) < DE_LENGTH_OF_ARRAY(ARRAY); (ITERATOR)++) \ BODY FOR_EACH(wrapS, wrapModes, diff --git a/modules/gles2/functional/es2fUniformApiTests.cpp b/modules/gles2/functional/es2fUniformApiTests.cpp index f3470eb..ff05e27 100644 --- a/modules/gles2/functional/es2fUniformApiTests.cpp +++ b/modules/gles2/functional/es2fUniformApiTests.cpp @@ -924,7 +924,7 @@ deUint32 UniformCase::randomFeatures (const deUint32 seed) deUint32 result = 0; -#define ARRAY_CHOICE(ARR) (ARR[rnd.getInt(0, DE_LENGTH_OF_ARRAY(ARR)-1)]) +#define ARRAY_CHOICE(ARR) ((ARR)[rnd.getInt(0, DE_LENGTH_OF_ARRAY(ARR)-1)]) result |= ARRAY_CHOICE(arrayUsageChoices); result |= ARRAY_CHOICE(uniformFuncChoices); @@ -1445,7 +1445,7 @@ bool UniformCase::checkUniformDefaultValues (const vector& values, con { \ for (int i = 0; i < valSize; i++) \ { \ - if (unifValue.val.VAR_VALUE_MEMBER[i] != ZERO) \ + if (unifValue.val.VAR_VALUE_MEMBER[i] != (ZERO)) \ { \ log << TestLog::Message << "// FAILURE: uniform " << uniform.name << " has non-zero initial value" << TestLog::EndMessage; \ success = false; \ diff --git a/modules/gles2/functional/es2fVertexTextureTests.cpp b/modules/gles2/functional/es2fVertexTextureTests.cpp index 432b2a4..382740a 100644 --- a/modules/gles2/functional/es2fVertexTextureTests.cpp +++ b/modules/gles2/functional/es2fVertexTextureTests.cpp @@ -1082,7 +1082,7 @@ void VertexTextureTests::init (void) }; #define FOR_EACH(ITERATOR, ARRAY, BODY) \ - for (int ITERATOR = 0; ITERATOR < DE_LENGTH_OF_ARRAY(ARRAY); ITERATOR++) \ + for (int (ITERATOR) = 0; (ITERATOR) < DE_LENGTH_OF_ARRAY(ARRAY); (ITERATOR)++) \ BODY // 2D cases. diff --git a/modules/gles2/performance/es2pTextureUploadTests.cpp b/modules/gles2/performance/es2pTextureUploadTests.cpp index add6c02..727769f 100644 --- a/modules/gles2/performance/es2pTextureUploadTests.cpp +++ b/modules/gles2/performance/es2pTextureUploadTests.cpp @@ -534,7 +534,7 @@ void TextureUploadTests::init (void) }; #define FOR_EACH(ITERATOR, ARRAY, BODY) \ - for (int ITERATOR = 0; ITERATOR < DE_LENGTH_OF_ARRAY(ARRAY); ITERATOR++) \ + for (int (ITERATOR) = 0; (ITERATOR) < DE_LENGTH_OF_ARRAY(ARRAY); (ITERATOR)++) \ BODY FOR_EACH(uploadFunc, uploadFunctions, diff --git a/modules/gles3/accuracy/es3aTextureFilteringTests.cpp b/modules/gles3/accuracy/es3aTextureFilteringTests.cpp index 8f44f53..1a4d517 100644 --- a/modules/gles3/accuracy/es3aTextureFilteringTests.cpp +++ b/modules/gles3/accuracy/es3aTextureFilteringTests.cpp @@ -714,7 +714,7 @@ void TextureFilteringTests::init (void) }; #define FOR_EACH(ITERATOR, ARRAY, BODY) \ - for (int ITERATOR = 0; ITERATOR < DE_LENGTH_OF_ARRAY(ARRAY); ITERATOR++) \ + for (int (ITERATOR) = 0; (ITERATOR) < DE_LENGTH_OF_ARRAY(ARRAY); (ITERATOR)++) \ BODY // 2D cases. diff --git a/modules/gles3/functional/es3fApiCase.hpp b/modules/gles3/functional/es3fApiCase.hpp index 9038a27..87085e8 100644 --- a/modules/gles3/functional/es3fApiCase.hpp +++ b/modules/gles3/functional/es3fApiCase.hpp @@ -62,7 +62,7 @@ protected: public: \ ApiCase_##NAME (Context& context) : ApiCase(context, #NAME, DESCRIPTION) {} \ protected: \ - void test (void) TEST_FUNC_BODY \ + void test (void) TEST_FUNC_BODY /* NOLINT(TEST_FUNC_BODY) */ \ }; \ addChild(new ApiCase_##NAME(m_context)); \ } while (deGetFalse()) diff --git a/modules/gles3/functional/es3fBooleanStateQueryTests.cpp b/modules/gles3/functional/es3fBooleanStateQueryTests.cpp index 308bb49..eb81d41 100644 --- a/modules/gles3/functional/es3fBooleanStateQueryTests.cpp +++ b/modules/gles3/functional/es3fBooleanStateQueryTests.cpp @@ -718,7 +718,7 @@ public: #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - StateVerifier* verifier = VERIFIERS[_verifierNdx]; \ + StateVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles3/functional/es3fBufferObjectQueryTests.cpp b/modules/gles3/functional/es3fBufferObjectQueryTests.cpp index 34b238e..d6d7152 100644 --- a/modules/gles3/functional/es3fBufferObjectQueryTests.cpp +++ b/modules/gles3/functional/es3fBufferObjectQueryTests.cpp @@ -484,7 +484,7 @@ public: #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - BufferParamVerifier* verifier = VERIFIERS[_verifierNdx]; \ + BufferParamVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles3/functional/es3fDefaultVertexAttributeTests.cpp b/modules/gles3/functional/es3fDefaultVertexAttributeTests.cpp index 5117e83..61e63ab 100644 --- a/modules/gles3/functional/es3fDefaultVertexAttributeTests.cpp +++ b/modules/gles3/functional/es3fDefaultVertexAttributeTests.cpp @@ -94,7 +94,7 @@ public: }; \ enum \ { \ - COMPONENTS = COMPS \ + COMPONENTS = (COMPS) \ }; \ typedef TYPE Type; \ \ @@ -128,7 +128,7 @@ public: }; \ enum \ { \ - COMPONENTS = COMPS \ + COMPONENTS = (COMPS) \ }; \ typedef TYPE Type; \ \ @@ -162,7 +162,7 @@ public: }; \ enum \ { \ - COMPONENTS = COMPS \ + COMPONENTS = (COMPS) \ }; \ typedef TYPE Type; \ \ @@ -196,7 +196,7 @@ public: }; \ enum \ { \ - COMPONENTS = COMPS \ + COMPONENTS = (COMPS) \ }; \ typedef TYPE Type; \ \ diff --git a/modules/gles3/functional/es3fFloatStateQueryTests.cpp b/modules/gles3/functional/es3fFloatStateQueryTests.cpp index 36a0615..0ae190d 100644 --- a/modules/gles3/functional/es3fFloatStateQueryTests.cpp +++ b/modules/gles3/functional/es3fFloatStateQueryTests.cpp @@ -1239,7 +1239,7 @@ private: #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - StateVerifier* verifier = VERIFIERS[_verifierNdx]; \ + StateVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles3/functional/es3fInteger64StateQueryTests.cpp b/modules/gles3/functional/es3fInteger64StateQueryTests.cpp index 1ad90d9..9bdfbfe 100644 --- a/modules/gles3/functional/es3fInteger64StateQueryTests.cpp +++ b/modules/gles3/functional/es3fInteger64StateQueryTests.cpp @@ -257,7 +257,7 @@ private: #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - StateVerifier* verifier = VERIFIERS[_verifierNdx]; \ + StateVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles3/functional/es3fIntegerStateQueryTests.cpp b/modules/gles3/functional/es3fIntegerStateQueryTests.cpp index 7760d11..518d608 100644 --- a/modules/gles3/functional/es3fIntegerStateQueryTests.cpp +++ b/modules/gles3/functional/es3fIntegerStateQueryTests.cpp @@ -2707,14 +2707,14 @@ static const char* getQueryTypeSuffix (QueryType type) #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - StateVerifier* verifier = VERIFIERS[_verifierNdx]; \ + StateVerifier* verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } #define FOR_EACH_QUERYTYPE(QUERYTYPES, CODE_BLOCK) \ for (int _queryTypeNdx = 0; _queryTypeNdx < DE_LENGTH_OF_ARRAY(QUERYTYPES); _queryTypeNdx++) \ { \ - const QueryType queryType = QUERYTYPES[_queryTypeNdx]; \ + const QueryType queryType = (QUERYTYPES)[_queryTypeNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles3/functional/es3fSamplerStateQueryTests.cpp b/modules/gles3/functional/es3fSamplerStateQueryTests.cpp index e1a5bea..832b237 100644 --- a/modules/gles3/functional/es3fSamplerStateQueryTests.cpp +++ b/modules/gles3/functional/es3fSamplerStateQueryTests.cpp @@ -53,7 +53,7 @@ static const char* getVerifierSuffix (QueryType type) #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - QueryType verifier = VERIFIERS[_verifierNdx]; \ + QueryType verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles3/functional/es3fShaderStructTests.cpp b/modules/gles3/functional/es3fShaderStructTests.cpp index 57dbe60..3827685 100644 --- a/modules/gles3/functional/es3fShaderStructTests.cpp +++ b/modules/gles3/functional/es3fShaderStructTests.cpp @@ -185,7 +185,7 @@ void LocalStructTests::init (void) { #define LOCAL_STRUCT_CASE(NAME, DESCRIPTION, SHADER_SRC, EVAL_FUNC_BODY) \ do { \ - struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; \ + struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; /* NOLINT(EVAL_FUNC_BODY) */ \ addChild(createStructCase(m_context, #NAME "_vertex", DESCRIPTION, true, false, &Eval_##NAME::eval, DE_NULL, SHADER_SRC)); \ addChild(createStructCase(m_context, #NAME "_fragment", DESCRIPTION, false, false,&Eval_##NAME::eval, DE_NULL, SHADER_SRC)); \ } while (deGetFalse()) @@ -1140,7 +1140,7 @@ public: namespace { -#define CHECK_SET_UNIFORM(NAME) GLU_EXPECT_NO_ERROR(gl.getError(), (string("Failed to set ") + NAME).c_str()) +#define CHECK_SET_UNIFORM(NAME) GLU_EXPECT_NO_ERROR(gl.getError(), (string("Failed to set ") + (NAME)).c_str()) #define MAKE_SET_VEC_UNIFORM(VECTYPE, SETUNIFORM) \ void setUniform (const glw::Functions& gl, deUint32 programID, const char* name, const tcu::VECTYPE& vec) \ @@ -1191,8 +1191,10 @@ void UniformStructTests::init (void) { #define UNIFORM_STRUCT_CASE(NAME, DESCRIPTION, TEXTURES, SHADER_SRC, SET_UNIFORMS_BODY, EVAL_FUNC_BODY) \ do { \ - struct SetUniforms_##NAME { static void setUniforms (const glw::Functions& gl, deUint32 programID, const tcu::Vec4& constCoords) SET_UNIFORMS_BODY }; \ - struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; \ + struct SetUniforms_##NAME { \ + static void setUniforms (const glw::Functions& gl, deUint32 programID, const tcu::Vec4& constCoords) SET_UNIFORMS_BODY /* NOLINT(SET_UNIFORMS_BODY) */ \ + }; \ + struct Eval_##NAME { static void eval (ShaderEvalContext& c) EVAL_FUNC_BODY }; /* NOLINT(EVAL_FUNC_BODY) */ \ addChild(createStructCase(m_context, #NAME "_vertex", DESCRIPTION, true, TEXTURES, Eval_##NAME::eval, SetUniforms_##NAME::setUniforms, SHADER_SRC)); \ addChild(createStructCase(m_context, #NAME "_fragment", DESCRIPTION, false, TEXTURES, Eval_##NAME::eval, SetUniforms_##NAME::setUniforms, SHADER_SRC)); \ } while (deGetFalse()) diff --git a/modules/gles3/functional/es3fTextureStateQueryTests.cpp b/modules/gles3/functional/es3fTextureStateQueryTests.cpp index 5047e55..475f835 100644 --- a/modules/gles3/functional/es3fTextureStateQueryTests.cpp +++ b/modules/gles3/functional/es3fTextureStateQueryTests.cpp @@ -52,7 +52,7 @@ static const char* getVerifierSuffix (QueryType type) #define FOR_EACH_VERIFIER(VERIFIERS, CODE_BLOCK) \ for (int _verifierNdx = 0; _verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); _verifierNdx++) \ { \ - QueryType verifier = VERIFIERS[_verifierNdx]; \ + QueryType verifier = (VERIFIERS)[_verifierNdx]; \ CODE_BLOCK; \ } diff --git a/modules/gles3/functional/es3fTextureWrapTests.cpp b/modules/gles3/functional/es3fTextureWrapTests.cpp index e137304..0a7d2f7 100644 --- a/modules/gles3/functional/es3fTextureWrapTests.cpp +++ b/modules/gles3/functional/es3fTextureWrapTests.cpp @@ -389,7 +389,7 @@ void TextureWrapTests::init (void) }; #define FOR_EACH(ITERATOR, ARRAY, BODY) \ - for (int ITERATOR = 0; ITERATOR < DE_LENGTH_OF_ARRAY(ARRAY); ITERATOR++) \ + for (int (ITERATOR) = 0; (ITERATOR) < DE_LENGTH_OF_ARRAY(ARRAY); (ITERATOR)++) \ BODY // RGBA8 cases. diff --git a/modules/gles3/functional/es3fUniformApiTests.cpp b/modules/gles3/functional/es3fUniformApiTests.cpp index 7d75d1c..be953af 100644 --- a/modules/gles3/functional/es3fUniformApiTests.cpp +++ b/modules/gles3/functional/es3fUniformApiTests.cpp @@ -1094,7 +1094,7 @@ deUint32 UniformCase::randomFeatures (const deUint32 seed) deUint32 result = 0; -#define ARRAY_CHOICE(ARR) (ARR[rnd.getInt(0, DE_LENGTH_OF_ARRAY(ARR)-1)]) +#define ARRAY_CHOICE(ARR) ((ARR)[rnd.getInt(0, DE_LENGTH_OF_ARRAY(ARR)-1)]) result |= ARRAY_CHOICE(arrayUsageChoices); result |= ARRAY_CHOICE(uniformFuncChoices); @@ -1811,7 +1811,7 @@ bool UniformCase::checkUniformDefaultValues (const vector& values, con { \ for (int i = 0; i < valSize; i++) \ { \ - if (unifValue.val.VAR_VALUE_MEMBER[i] != ZERO) \ + if (unifValue.val.VAR_VALUE_MEMBER[i] != (ZERO)) \ { \ log << TestLog::Message << "// FAILURE: uniform " << uniform.name << " has non-zero initial value" << TestLog::EndMessage; \ success = false; \ diff --git a/modules/gles3/functional/es3fVertexTextureTests.cpp b/modules/gles3/functional/es3fVertexTextureTests.cpp index a2cd1c0..50a45d5 100644 --- a/modules/gles3/functional/es3fVertexTextureTests.cpp +++ b/modules/gles3/functional/es3fVertexTextureTests.cpp @@ -1881,7 +1881,7 @@ void VertexTextureTests::init (void) }; #define FOR_EACH(ITERATOR, ARRAY, BODY) \ - for (int ITERATOR = 0; ITERATOR < DE_LENGTH_OF_ARRAY(ARRAY); ITERATOR++) \ + for (int (ITERATOR) = 0; (ITERATOR) < DE_LENGTH_OF_ARRAY(ARRAY); (ITERATOR)++) \ BODY // 2D cases. diff --git a/modules/gles31/functional/es31fBooleanStateQueryTests.cpp b/modules/gles31/functional/es31fBooleanStateQueryTests.cpp index e12b329..6395016 100644 --- a/modules/gles31/functional/es31fBooleanStateQueryTests.cpp +++ b/modules/gles31/functional/es31fBooleanStateQueryTests.cpp @@ -126,8 +126,8 @@ void BooleanStateQueryTests::init (void) #define FOR_EACH_VERIFIER(VERIFIERS, X) \ for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); ++verifierNdx) \ { \ - const char* verifierSuffix = getVerifierSuffix(VERIFIERS[verifierNdx]); \ - const QueryType verifier = VERIFIERS[verifierNdx]; \ + const char* verifierSuffix = getVerifierSuffix((VERIFIERS)[verifierNdx]); \ + const QueryType verifier = (VERIFIERS)[verifierNdx]; \ this->addChild(X); \ } diff --git a/modules/gles31/functional/es31fSamplerStateQueryTests.cpp b/modules/gles31/functional/es31fSamplerStateQueryTests.cpp index 9d4651a..7342793 100644 --- a/modules/gles31/functional/es31fSamplerStateQueryTests.cpp +++ b/modules/gles31/functional/es31fSamplerStateQueryTests.cpp @@ -102,8 +102,8 @@ void SamplerStateQueryTests::init (void) #define FOR_EACH_VERIFIER(VERIFIERS, X) \ for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); ++verifierNdx) \ { \ - const char* verifierSuffix = getVerifierSuffix(VERIFIERS[verifierNdx]); \ - const QueryType verifier = VERIFIERS[verifierNdx]; \ + const char* verifierSuffix = getVerifierSuffix((VERIFIERS)[verifierNdx]); \ + const QueryType verifier = (VERIFIERS)[verifierNdx]; \ targetGroup->addChild(X); \ } diff --git a/modules/gles31/functional/es31fTextureStateQueryTests.cpp b/modules/gles31/functional/es31fTextureStateQueryTests.cpp index 09e8eb3..3fe64b7 100644 --- a/modules/gles31/functional/es31fTextureStateQueryTests.cpp +++ b/modules/gles31/functional/es31fTextureStateQueryTests.cpp @@ -104,8 +104,8 @@ void TextureStateQueryTests::init (void) #define FOR_EACH_VERIFIER(VERIFIERS, X) \ for (int verifierNdx = 0; verifierNdx < DE_LENGTH_OF_ARRAY(VERIFIERS); ++verifierNdx) \ { \ - const char* verifierSuffix = getVerifierSuffix(VERIFIERS[verifierNdx]); \ - const QueryType verifier = VERIFIERS[verifierNdx]; \ + const char* verifierSuffix = getVerifierSuffix((VERIFIERS)[verifierNdx]); \ + const QueryType verifier = (VERIFIERS)[verifierNdx]; \ targetGroup->addChild(X); \ } diff --git a/modules/glshared/glsBuiltinPrecisionTests.cpp b/modules/glshared/glsBuiltinPrecisionTests.cpp index 198e1ad..7940843 100644 --- a/modules/glshared/glsBuiltinPrecisionTests.cpp +++ b/modules/glshared/glsBuiltinPrecisionTests.cpp @@ -2154,7 +2154,7 @@ ExprP log (const ExprP& x) { return app(x); } ExprP NAME (const ExprP& arg0) { return app(arg0); } #define DEFINE_DERIVED1(CLASS, TRET, NAME, T0, ARG0, EXPANSION) \ -class CLASS : public DerivedFunc > \ +class CLASS : public DerivedFunc > /* NOLINT(CLASS) */ \ { \ public: \ string getName (void) const { return #NAME; } \ @@ -2163,7 +2163,7 @@ protected: \ ExprP doExpand (ExpandContext&, \ const CLASS::ArgExprs& args_) const \ { \ - const ExprP& ARG0 = args_.a; \ + const ExprP& (ARG0) = args_.a; \ return EXPANSION; \ } \ }; \ @@ -2179,7 +2179,7 @@ ExprP NAME (const ExprP& arg0, const ExprP& arg1) \ } #define DEFINE_DERIVED2(CLASS, TRET, NAME, T0, Arg0, T1, Arg1, EXPANSION) \ -class CLASS : public DerivedFunc > \ +class CLASS : public DerivedFunc > /* NOLINT(CLASS) */ \ { \ public: \ string getName (void) const { return #NAME; } \ @@ -2187,8 +2187,8 @@ public: \ protected: \ ExprP doExpand (ExpandContext&, const ArgExprs& args_) const \ { \ - const ExprP& Arg0 = args_.a; \ - const ExprP& Arg1 = args_.b; \ + const ExprP& (Arg0) = args_.a; \ + const ExprP& (Arg1) = args_.b; \ return EXPANSION; \ } \ }; \ @@ -2204,7 +2204,7 @@ ExprP NAME (const ExprP& arg0, const ExprP& arg1, const ExprP& } #define DEFINE_DERIVED3(CLASS, TRET, NAME, T0, ARG0, T1, ARG1, T2, ARG2, EXPANSION) \ -class CLASS : public DerivedFunc > \ +class CLASS : public DerivedFunc > /* NOLINT(CLASS) */ \ { \ public: \ string getName (void) const { return #NAME; } \ @@ -2212,9 +2212,9 @@ public: \ protected: \ ExprP doExpand (ExpandContext&, const ArgExprs& args_) const \ { \ - const ExprP& ARG0 = args_.a; \ - const ExprP& ARG1 = args_.b; \ - const ExprP& ARG2 = args_.c; \ + const ExprP& (ARG0) = args_.a; \ + const ExprP& (ARG1) = args_.b; \ + const ExprP& (ARG2) = args_.c; \ return EXPANSION; \ } \ }; \ diff --git a/modules/glshared/glsTextureStateQueryTests.cpp b/modules/glshared/glsTextureStateQueryTests.cpp index d39b7ce..6b16529 100644 --- a/modules/glshared/glsTextureStateQueryTests.cpp +++ b/modules/glshared/glsTextureStateQueryTests.cpp @@ -500,7 +500,7 @@ static RequiredExtensions getQueryExtension (QueryType query) static bool isCoreTester (TesterType tester) { -#define COMPARE_PURE_SETTERS(TESTER, X) (TESTER == X ## _SET_PURE_INT) || (TESTER == X ## _SET_PURE_UINT) +#define COMPARE_PURE_SETTERS(TESTER, X) ((TESTER) == X ## _SET_PURE_INT) || ((TESTER) == X ## _SET_PURE_UINT) return es31::isCoreTester(tester) || COMPARE_PURE_SETTERS(tester, TESTER_TEXTURE_SWIZZLE_R) || -- 2.7.4