From 9cd2cd6872396ad332d9bbf3c526192b30e500c0 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 13 Jul 2016 19:11:38 -1000 Subject: [PATCH 1/8] Update submodules --- .clang-format | 31 +++++++++++++++++++++++++++++++ amuse | 2 +- hecl | 2 +- specter | 2 +- 4 files changed, 34 insertions(+), 3 deletions(-) create mode 100644 .clang-format diff --git a/.clang-format b/.clang-format new file mode 100644 index 000000000..e54954b03 --- /dev/null +++ b/.clang-format @@ -0,0 +1,31 @@ +--- +IndentWidth: 4 +ColumnLimit: 120 +UseTab: Never +--- +Language: Cpp +DerivePointerAlignment: false +PointerAlignment: Left +AlignAfterOpenBracket: Align +AlignConsecutiveAssignments: false +BreakBeforeBraces: Allman +IndentCaseLabels: false +AllowShortBlocksOnASingleLine: true +AlignOperands: true +AlignTrailingComments: true +AlwaysBreakBeforeMultilineStrings: true +AlwaysBreakTemplateDeclarations: true +BreakConstructorInitializersBeforeComma: true +BreakStringLiterals: true +AlwaysBreakAfterReturnType: None +AlwaysBreakAfterDefinitionReturnType: None +AllowShortFunctionsOnASingleLine: All +Cpp11BracedListStyle: true +NamespaceIndentation: None +ReflowComments: true +BinPackArguments: true +BinPackParameters: true +SortIncludes: false +AccessModifierOffset: -4 +ConstructorInitializerIndentWidth: 0 +ConstructorInitializerAllOnOneLineOrOnePerLine: true diff --git a/amuse b/amuse index 596bc66ce..2dcb9dd1c 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 596bc66ce62220bc5bca55ec3eae768ae9f6b333 +Subproject commit 2dcb9dd1c775a895e111f267a6730d71f9760549 diff --git a/hecl b/hecl index 8c745118b..c39e20ee5 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 8c745118b4e86a883a31013b3948510a0cb28e81 +Subproject commit c39e20ee583d530c7f12d42be7e8014bf768e1e4 diff --git a/specter b/specter index 720ab3d95..53432805c 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 720ab3d9527946ad753433b5b73abeeb87b8efe1 +Subproject commit 53432805c7e12472f3b66f10eeaf9415003bae1a From f3cb1591c9ef7741e138375bc6d5e3e73bd1aa11 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 13 Jul 2016 19:39:50 -1000 Subject: [PATCH 2/8] Update hecl --- hecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hecl b/hecl index c39e20ee5..b42137bbd 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit c39e20ee583d530c7f12d42be7e8014bf768e1e4 +Subproject commit b42137bbd25c77215860038325b2ba59428423a4 From d36debd12e9aecb6fd0707fb4565501b437cce2b Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 13 Jul 2016 20:17:20 -1000 Subject: [PATCH 3/8] Update submodules --- amuse | 2 +- hecl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/amuse b/amuse index 2dcb9dd1c..d602fbacd 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit 2dcb9dd1c775a895e111f267a6730d71f9760549 +Subproject commit d602fbacd37e38f54f74ee02ec5a4df74060dbe8 diff --git a/hecl b/hecl index b42137bbd..685457d47 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit b42137bbd25c77215860038325b2ba59428423a4 +Subproject commit 685457d47b02ddbd4f4dad5afc534aa717b10f0d From f6750bff6f5cffafa0b8b76902186e1aa0a44003 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Wed, 13 Jul 2016 21:16:14 -1000 Subject: [PATCH 4/8] Update amuse --- amuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amuse b/amuse index d602fbacd..d06a5ebcf 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit d602fbacd37e38f54f74ee02ec5a4df74060dbe8 +Subproject commit d06a5ebcfa3f36e4ac35aff59844cde8e4ca1db2 From 68c643741b4302663f52caaea6699f65b921469e Mon Sep 17 00:00:00 2001 From: Phillip Stephens Date: Thu, 14 Jul 2016 12:19:28 -0700 Subject: [PATCH 5/8] Update submodules --- hecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hecl b/hecl index 685457d47..4b69b785b 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 685457d47b02ddbd4f4dad5afc534aa717b10f0d +Subproject commit 4b69b785b075c3b90a16df9330a637a85dbd7200 From 0adeb23a1050771fe997f61f0ba57f6221057ab7 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 14 Jul 2016 09:43:48 -1000 Subject: [PATCH 6/8] Update amuse --- amuse | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/amuse b/amuse index d06a5ebcf..5bae40d3c 160000 --- a/amuse +++ b/amuse @@ -1 +1 @@ -Subproject commit d06a5ebcfa3f36e4ac35aff59844cde8e4ca1db2 +Subproject commit 5bae40d3c30c4471c55584f6bdbf1465eff19707 From e0ed0d9c894aa0c2ebe6b1d34ec89b9059bd57a0 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 14 Jul 2016 10:05:42 -1000 Subject: [PATCH 7/8] Update specter --- specter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specter b/specter index 53432805c..ba713f562 160000 --- a/specter +++ b/specter @@ -1 +1 @@ -Subproject commit 53432805c7e12472f3b66f10eeaf9415003bae1a +Subproject commit ba713f562b5b73b442e3e5e32c367b77ce843a66 From bbebafe1b5756aa700b099c44f50a4f74b69c418 Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 14 Jul 2016 11:30:53 -1000 Subject: [PATCH 8/8] Update submodules --- hecl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hecl b/hecl index 4b69b785b..ee64d9872 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 4b69b785b075c3b90a16df9330a637a85dbd7200 +Subproject commit ee64d9872b9eb793371b1c62006b7e86ca79de8f