From 9e308d88f9dc77b04da638cceb497ac3784dce87 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Fri, 3 Mar 2023 20:25:23 +0800 Subject: [PATCH] update zlinuxcomponents and .clang-format --- .clang-format | 6 +++++- .vscode/settings.json | 9 ++++++++- dep/zlinuxcomponents | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.clang-format b/.clang-format index 1b046df..271b561 100644 --- a/.clang-format +++ b/.clang-format @@ -2,4 +2,8 @@ # http://clang.llvm.org/docs/ClangFormatStyleOptions.html Language: Cpp BasedOnStyle: Google -ColumnLimit: 120 \ No newline at end of file +ColumnLimit: 120 +AlignConsecutiveMacros: true +AlignConsecutiveDeclarations: true +AlignConsecutiveAssignments: true +AlignOperands: true \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index e92d171..3dac223 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -87,6 +87,13 @@ "__hash_table": "cpp", "__tree": "cpp", "__tuple": "cpp", - "*.ipp": "cpp" + "*.ipp": "cpp", + "complex": "cpp", + "csetjmp": "cpp", + "cuchar": "cpp", + "unordered_set": "cpp", + "rope": "cpp", + "slist": "cpp", + "scoped_allocator": "cpp" } } \ No newline at end of file diff --git a/dep/zlinuxcomponents b/dep/zlinuxcomponents index 4709e45..2604db7 160000 --- a/dep/zlinuxcomponents +++ b/dep/zlinuxcomponents @@ -1 +1 @@ -Subproject commit 4709e454d71e4656d92f2badcd17ddb5de668265 +Subproject commit 2604db75b02ebc504929abc2027afebe4ca647b8