[UPDATE] Update the forked clang-format to 4.0

.clang-format

@@ -36,6 +36,7 @@ BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Custom
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: true
+BreakStringLiterals: true
 ColumnLimit:     120
 CommentPragmas:  '^ IWYU pragma:'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
@@ -46,7 +47,6 @@ DerivePointerAlignment: false
 DisableFormat:   false
 ExperimentalAutoDetectBinPacking: false
 ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
-IncludeCategories:
 IncludeCategories:
   - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
     Priority:        2
@@ -54,9 +54,12 @@ IncludeCategories:
     Priority:        3
   - Regex:           '.\*'
     Priority:        1
+IncludeIsMainRegex: '$'
 IndentCaseLabels: false
 IndentWidth:     4
 IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
 KeepEmptyLinesAtTheStartOfBlocks: true
 MacroBlockBegin: ''
 MacroBlockEnd:   ''
@@ -75,6 +78,7 @@ PointerAlignment: Left
 ReflowComments:  true
 SortIncludes:    true
 SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: false
 SpaceBeforeAssignmentOperators: true
 SpaceBeforeParens: Never
 SpaceInEmptyParentheses: false
@@ -87,6 +91,5 @@ SpacesInSquareBrackets: false
 Standard:        Cpp11
 TabWidth:        4
 UseTab:          Always
-SpaceAfterTemplateKeyword: false
 ...
 

src/anki/gr/gl/StateTracker.h

@@ -178,7 +178,7 @@ public:
 			m_stencilFail[0], m_stencilPassDepthFail[0], m_stencilPassDepthPass[0], m_stencilCompare[0]);
 		enable = enable
 			|| !stencilTestDisabled(
-					 m_stencilFail[1], m_stencilPassDepthFail[1], m_stencilPassDepthPass[1], m_stencilCompare[1]);
+				   m_stencilFail[1], m_stencilPassDepthFail[1], m_stencilPassDepthPass[1], m_stencilCompare[1]);
 
 		if(enable != m_stencilTestEnabled)
 		{

src/anki/util/Visitor.h

@@ -59,7 +59,7 @@ struct GetVariadicTypeId
 	template<typename Type>
 	static constexpr I get()
 	{
-		return sizeof...(Types)-Helper<Type, Types...>::ID - 1;
+		return sizeof...(Types) - Helper<Type, Types...>::ID - 1;
 	}
 };
 
@@ -172,7 +172,7 @@ private:
 	template<typename TVisitor, typename TFirst, typename TSecond, typename... Types_>
 	void acceptVisitorInternal(TVisitor& v)
 	{
-		constexpr I i = sizeof...(Types) - sizeof...(Types_)-1;
+		constexpr I i = sizeof...(Types) - sizeof...(Types_) - 1;
 
 		switch(m_what)
 		{
@@ -202,7 +202,7 @@ private:
 	template<typename TVisitor, typename TFirst, typename TSecond, typename... Types_>
 	void acceptVisitorInternalConst(TVisitor& v) const
 	{
-		constexpr I i = sizeof...(Types) - sizeof...(Types_)-1;
+		constexpr I i = sizeof...(Types) - sizeof...(Types_) - 1;
 
 		switch(m_what)
 		{
@@ -311,7 +311,7 @@ private:
 	ANKI_USE_RESULT Error acceptVisitorInternal(TVisitor& v)
 	{
 		Error err = ErrorCode::NONE;
-		constexpr I i = sizeof...(Types) - sizeof...(Types_)-1;
+		constexpr I i = sizeof...(Types) - sizeof...(Types_) - 1;
 
 		switch(m_what)
 		{
@@ -364,7 +364,7 @@ private:
 	ANKI_USE_RESULT Error acceptVisitorInternalConst(TVisitor& v) const
 	{
 		Error err = ErrorCode::NONE;
-		constexpr I i = sizeof...(Types) - sizeof...(Types_)-1;
+		constexpr I i = sizeof...(Types) - sizeof...(Types_) - 1;
 
 		switch(m_what)
 		{

tests/gr/Gr.cpp

@@ -380,11 +380,7 @@ static void createCube(GrManager& gr, BufferPtr& verts, BufferPtr& indices)
 	indices->unmap();
 }
 
-ANKI_TEST(Gr, GrManager)
-{
-	COMMON_BEGIN()
-	COMMON_END()
-}
+ANKI_TEST(Gr, GrManager){COMMON_BEGIN() COMMON_END()}
 
 ANKI_TEST(Gr, Shader)
 {

thirdparty

@@ -1 +1 @@
-Subproject commit 40d7763bfa5b7babad7ad969e0dadddebff930f4
+Subproject commit b5bd7ae5c2d51d1220c5076f17c9adec3f5b46cc