From 6bea71ea4a1ca78a406211df89941ba30b4e7d16 Mon Sep 17 00:00:00 2001 From: Sanath Keshav Date: Fri, 23 Aug 2024 22:32:45 +0200 Subject: [PATCH 1/3] Fix include order in src/reader.cpp which was broken by clang-format (#7) * Fixed include order in src/reader.cpp * Disable SortIncludes in clang-format --------- Co-authored-by: ac133718 Co-authored-by: Ishaan Desai --- .clang-format | 2 +- src/reader.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.clang-format b/.clang-format index 3868c2e..f59ea11 100644 --- a/.clang-format +++ b/.clang-format @@ -93,7 +93,7 @@ PenaltyExcessCharacter: 1000000 PenaltyReturnTypeOnItsOwnLine: 100 PointerAlignment: Right ReflowComments: true -SortIncludes: true +SortIncludes: false SortUsingDeclarations: true SpaceAfterCStyleCast: true SpaceAfterTemplateKeyword: true diff --git a/src/reader.cpp b/src/reader.cpp index c6baf7e..03e9ba8 100644 --- a/src/reader.cpp +++ b/src/reader.cpp @@ -1,5 +1,5 @@ -#include "reader.h" #include "general.h" +#include "reader.h" #include "H5Cpp.h" #include "fftw3-mpi.h" From 299de5cd6e82f815857e25137769f46a5803a112 Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Sat, 24 Aug 2024 20:43:16 +0200 Subject: [PATCH 2/3] Update CHANGELOG --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b166451..604c814 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # FANS Changelog +## latest + +- Disable sorting of includes in clang-format https://github.com/DataAnalyticsEngineering/FANS/pull/7 + ## v0.1.0 - Add release guide and a Changelog file https://github.com/DataAnalyticsEngineering/FANS/pull/4 From be8601a067c60b097cf3e47ed14c4a6f9bc966b4 Mon Sep 17 00:00:00 2001 From: Ishaan Desai Date: Sun, 25 Aug 2024 11:33:45 +0200 Subject: [PATCH 3/3] Bump version --- CHANGELOG.md | 2 +- CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 604c814..d021572 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # FANS Changelog -## latest +## v0.1.1 - Disable sorting of includes in clang-format https://github.com/DataAnalyticsEngineering/FANS/pull/7 diff --git a/CMakeLists.txt b/CMakeLists.txt index b299b6c..a1aa09d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.0...3.28) # ############################################################################## project(FANS - VERSION 0.1.0 + VERSION 0.1.1 LANGUAGES C CXX )