From 0e5d1bb66ad3135cd14972afd86763520140768a Mon Sep 17 00:00:00 2001 From: John Kessenich Date: Fri, 19 Apr 2019 00:11:07 -0600 Subject: [PATCH] clang-format correction and typo (clang format likely not complete) This was added some time ago, but I suspect largely unused. Christoph pointed out of few contradictions to actual convention, so that's fixed. But, I suspect it is largely incomplete. --- .clang-format | 3 ++- glslang/MachineIndependent/Intermediate.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index daf87985e..8c73a52fe 100644 --- a/.clang-format +++ b/.clang-format @@ -1,7 +1,8 @@ Language: Cpp IndentWidth: 4 +PointerAlignment: Left BreakBeforeBraces: Custom -BraceWrapping: { AfterFunction: true, AfterControlStatement: true } +BraceWrapping: { AfterFunction: true, AfterControlStatement: false } IndentCaseLabels: false ReflowComments: false ColumnLimit: 120 diff --git a/glslang/MachineIndependent/Intermediate.cpp b/glslang/MachineIndependent/Intermediate.cpp index 5e9c78482..4ec728d0f 100644 --- a/glslang/MachineIndependent/Intermediate.cpp +++ b/glslang/MachineIndependent/Intermediate.cpp @@ -410,7 +410,7 @@ TIntermTyped* TIntermediate::addBuiltInFunctionCall(const TSourceLoc& loc, TOper // // This is the safe way to change the operator on an aggregate, as it // does lots of error checking and fixing. Especially for establishing -// a function call's operation on it's set of parameters. Sequences +// a function call's operation on its set of parameters. Sequences // of instructions are also aggregates, but they just directly set // their operator to EOpSequence. //