Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: solvespace/solvespace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bedea1ef3c8d
Choose a base ref
...
head repository: solvespace/solvespace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b1e280e75f7f
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Sep 11, 2019

  1. Modify clang-format config to avoid single-line things. NFC.

    @rpavlik @whitequark
    rpavlik authored and whitequark committed Sep 11, 2019
    Copy the full SHA
    ec13839 View commit details

  2. Fix undefined behavior in IdList::end().

    @rpavlik @whitequark
    rpavlik authored and whitequark committed Sep 11, 2019
    Copy the full SHA
    b1e280e View commit details
Showing with 12 additions and 14 deletions.
  1. +10 −12 .clang-format
  2. +2 −2 src/dsc.h
22 changes: 10 additions & 12 deletions .clang-format
View file
Original file line number Diff line number Diff line change
@@ -10,22 +10,19 @@ ColumnLimit: 100

# Based on minimizing diff when applying clang-format
AccessModifierOffset: -4
DerivePointerAlignment: true
AlignConsecutiveAssignments: true
AlignEscapedNewlines: DontAlign
AllowShortBlocksOnASingleLine: false
AllowShortCaseLabelsOnASingleLine: true
AllowShortLoopsOnASingleLine: false
AlwaysBreakTemplateDeclarations: Yes # MultiLine
BreakConstructorInitializers: BeforeColon
DerivePointerAlignment: true
FixNamespaceComments: true
IndentPPDirectives: AfterHash
MaxEmptyLinesToKeep: 2
NamespaceIndentation: Inner
AllowShortLoopsOnASingleLine: true
AlwaysBreakTemplateDeclarations: Yes # MultiLine
SpaceAfterTemplateKeyword: false
MaxEmptyLinesToKeep: 2
IndentPPDirectives: AfterHash
AlignEscapedNewlines: DontAlign
BreakConstructorInitializers: BeforeColon
AllowShortCaseLabelsOnASingleLine: true

# This one is mixed in its effect: it permits some single-line functions,
# but also tends to put, e.g., enums on a single line.
AllowShortBlocksOnASingleLine: true

# No way to remove all space around operators as seen in much of the code I looked at.
#SpaceBeforeAssignmentOperators: false
@@ -41,3 +38,4 @@ SortUsingDeclarations: false

# Hard to tell what the desired config here was.
# AllowShortFunctionsOnASingleLine: Inline
AllowShortFunctionsOnASingleLine: None
4 changes: 2 additions & 2 deletions src/dsc.h
View file
Original file line number Diff line number Diff line change
@@ -474,9 +474,9 @@ class IdList {
T const &operator[](size_t i) const { return Get(i); }

T *begin() { return IsEmpty() ? nullptr : &elem[0]; }
T *end() { return IsEmpty() ? nullptr : &elem[n]; }
T *end() { return IsEmpty() ? nullptr : &elem[0] + n; }
const T *begin() const { return IsEmpty() ? nullptr : &elem[0]; }
const T *end() const { return IsEmpty() ? nullptr : &elem[n]; }
const T *end() const { return IsEmpty() ? nullptr : &elem[0] + n; }
const T *cbegin() const { return begin(); }
const T *cend() const { return end(); }