Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to clang-format 17 #138

Merged
merged 1 commit into from
Jul 21, 2024
Merged

Update to clang-format 17 #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ubuntu.yml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
Loading