Skip to content

Commit

Permalink
Merge branch 'dev' into refactor/triple-slash-docs-packet
Browse files Browse the repository at this point in the history
  • Loading branch information
Dimi1010 authored Feb 2, 2025
2 parents 3c9b754 + 2ae8837 commit 7705b5a
Show file tree
Hide file tree
Showing 33 changed files with 691 additions and 171 deletions.
2 changes: 1 addition & 1 deletion .codespellrc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[codespell]
skip = *.dat,typos-config.toml,.git,.venv,./ci,./Dist,./mk,./Tests/ExamplesTest/expected_output,./Tests/ExamplesTest/pcap_examples,./Tests/Packet++Test/PacketExamples,./Tests/Pcap++Test/PcapExamples,./3rdParty,./Examples/PcapSearch/dirent-for-Visual-Studio
skip = *.dat,typos-config.toml,.git,.venv,venv,./out,./ci,./Dist,./mk,./Tests/ExamplesTest/expected_output,./Tests/ExamplesTest/pcap_examples,./Tests/Packet++Test/PacketExamples,./Tests/Pcap++Test/PcapExamples,./3rdParty,./Examples/PcapSearch/dirent-for-Visual-Studio
ignore-words = codespell-ignore-list.txt
count =
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,17 +38,17 @@ repos:
- id: cppcheck
args: ["--std=c++11", "--language=c++", "--suppressions-list=cppcheckSuppressions.txt", "--inline-suppr", "--force"]
- repo: https://github.com/BlankSpruce/gersemi
rev: 0.17.1
rev: 0.18.2
hooks:
- id: gersemi
args: ["-c"]
- repo: https://github.com/codespell-project/codespell
rev: v2.3.0
rev: v2.4.1
hooks:
- id: codespell
pass_filenames: false
- repo: https://github.com/crate-ci/typos
rev: codespell-dict-v0.5.0
rev: typos-dict-v0.12.4
hooks:
- id: typos
args: ['--config=typos-config.toml']
Expand Down
1 change: 1 addition & 0 deletions Common++/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ set(
header/Logger.h
header/LRUList.h
header/MacAddress.h
header/ObjectPool.h
header/OUILookup.h
header/PcapPlusPlusVersion.h
header/PointerVector.h
Expand Down
1 change: 0 additions & 1 deletion Common++/header/IpAddress.h
Original file line number Diff line number Diff line change
Expand Up @@ -876,5 +876,4 @@ namespace pcpp
oss << network.toString();
return oss;
}

} // namespace pcpp
Loading

0 comments on commit 7705b5a

Please sign in to comment.