From: Shahbaz Youssefi Date: Tue, 25 Jun 2019 16:08:10 +0000 (-0400) Subject: Remove extraneous semicolons X-Git-Tag: upstream/11.4.0~457^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6cca0e983ee18b778c4bfcd736a08e0f8053f70a;p=platform%2Fupstream%2Fglslang.git Remove extraneous semicolons They cause a warning (-Wextra-semi) that can lead to a compile error (-Werror). --- diff --git a/SPIRV/SPVRemapper.h b/SPIRV/SPVRemapper.h index fa61bb9..d6b9c34 100644 --- a/SPIRV/SPVRemapper.h +++ b/SPIRV/SPVRemapper.h @@ -195,7 +195,7 @@ private: // Header access & set methods spirword_t magic() const { return spv[0]; } // return magic number spirword_t bound() const { return spv[3]; } // return Id bound from header - spirword_t bound(spirword_t b) { return spv[3] = b; }; + spirword_t bound(spirword_t b) { return spv[3] = b; } spirword_t genmagic() const { return spv[2]; } // generator magic spirword_t genmagic(spirword_t m) { return spv[2] = m; } spirword_t schemaNum() const { return spv[4]; } // schema number from header diff --git a/SPIRV/spvIR.h b/SPIRV/spvIR.h index b3cd0b0..7e2d4bc 100755 --- a/SPIRV/spvIR.h +++ b/SPIRV/spvIR.h @@ -436,6 +436,6 @@ __inline void Block::addInstruction(std::unique_ptr inst) parent.getParent().mapInstruction(raw_instruction); } -}; // end spv namespace +} // end spv namespace #endif // spvIR_H diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp index 640e738..e20068f 100644 --- a/glslang/MachineIndependent/Intermediate.cpp +++ b/glslang/MachineIndependent/Intermediate.cpp @@ -3789,7 +3789,7 @@ TIntermTyped* TIntermediate::promoteConstantUnion(TBasicType promoteTo, TIntermC for (int i=0; i < size; i++) { -#define PROMOTE(Set, CType, Get) leftUnionArray[i].Set(static_cast(rightUnionArray[i].Get())); +#define PROMOTE(Set, CType, Get) leftUnionArray[i].Set(static_cast(rightUnionArray[i].Get())) #define TO_ALL(Get) \ switch (promoteTo) { \