Skip to content

Commit

Permalink
Update to clang-format 17
Browse files Browse the repository at this point in the history
  • Loading branch information
hzeller committed Jul 20, 2024
1 parent be1af53 commit e94dfee
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ jobs:
build/src/timg --version
CodeFormatting:
runs-on: ubuntu-latest
runs-on: ubuntu-24.04

steps:

Expand All @@ -79,7 +79,7 @@ jobs:

- name: Install Dependencies
run: |
sudo apt-get install clang-format-13
sudo apt-get install clang-format-17
- name: Run formatting style check
run: ./.github/bin/run-clang-format.sh
Expand Down
2 changes: 1 addition & 1 deletion shell.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ pkgs.mkShell {

openslide
pandoc
clang-tools_13 # clang-format
clang-tools_17 # clang-format
];
}
4 changes: 1 addition & 3 deletions src/timg-time.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ class Duration {
return Duration(1000000000, 0); // a few years; infinite enough :)
}

struct timespec AsTimespec() const {
return duration_;
}
struct timespec AsTimespec() const { return duration_; }
struct timeval AsTimeval() const {
return {duration_.tv_sec, (suseconds_t)(duration_.tv_nsec / 1000)};
}
Expand Down

0 comments on commit e94dfee

Please sign in to comment.