Skip to content
Snippets Groups Projects
Unverified Commit c4aee8f4 authored by Guilhem Saurel's avatar Guilhem Saurel Committed by GitHub
Browse files

Merge pull request #226 from Guillaume227/gg-dev-format

Exclude macros from clang-format pre-commit hook formatting
parents 9f9a6ec9 2b327d2d
No related branches found
No related tags found
No related merge requests found
Pipeline #37297 passed with warnings
......@@ -24,7 +24,7 @@ repos:
rev: v17.0.3
hooks:
- id: clang-format
args: ['--style={BasedOnStyle: Google,SortIncludes: false}']
args: ['--style={BasedOnStyle: Google, SortIncludes: false, WhitespaceSensitiveMacros: ["TSID_DISABLE_WARNING"]}']
- repo: https://github.com/pappasam/toml-sort
rev: v0.23.1
hooks:
......
......@@ -18,7 +18,7 @@
#define TSID_DISABLE_WARNING(warningName) \
TSID_DO_PRAGMA(GCC diagnostic ignored #warningName)
#define TSID_DISABLE_WARNING_DEPRECATED \
TSID_DISABLE_WARNING(-Wdeprecated - declarations)
TSID_DISABLE_WARNING(-Wdeprecated-declarations)
#else
......
......@@ -39,7 +39,7 @@ class TaskContactForce : public TaskBase {
* tasks that involve all contacts, such as the CoP task.
*/
TSID_DISABLE_WARNING_PUSH
TSID_DISABLE_WARNING(-Woverloaded - virtual)
TSID_DISABLE_WARNING(-Woverloaded-virtual)
virtual const ConstraintBase& compute(
const double t, ConstRefVector q, ConstRefVector v, Data& data,
const std::vector<std::shared_ptr<ContactLevel> >* contacts) = 0;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment