-
Notifications
You must be signed in to change notification settings - Fork 531
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.
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
Convert to modern include guard #882 #891
Conversation
//#ifndef XML_TESTDATA_LOADER_H | ||
//#define XML_TESTDATA_LOADER_H |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please remove all these lines instead of just commenting them out.
I resolved the merge conflict but that created a clang-format issue. If you'd like I can fix that issue for you or you can do it by running pre-commit locally. Pre-commit and clang-fromat can be installed like this:
Then to run it locally before you commit (this will make so all the formatting passes the pre-commit check). You do this in your local checkout of moveit2:
|
Codecov Report
@@ Coverage Diff @@
## main #891 +/- ##
==========================================
+ Coverage 57.91% 57.92% +0.02%
==========================================
Files 310 310
Lines 26069 26069
==========================================
+ Hits 15095 15098 +3
+ Misses 10974 10971 -3
Continue to review full report at Codecov.
|
I am getting dpkg and apt errors on my machine while installing clang-format-10, probably some update issues, I can try fixing it later after fixing these errors or maybe do it yourself, I think I am just supposed to run pre-commit run -a and fix whatever is returned as "failed"? |
Running pre-commit should format all the files for you. So when it says "failed", it introduces the fixes for it too. Try running pre-commit again and you will see it pass. |
…moveit2 into add-pragma-once To push the commit for fix of include guards issue
...lz_industrial_motion_planner/include/pilz_industrial_motion_planner/joint_limits_extension.h
Outdated
Show resolved
Hide resolved
...ial_motion_planner/include/pilz_industrial_motion_planner/joint_limits_interface_extension.h
Outdated
Show resolved
Hide resolved
...trial_motion_planner_testutils/include/pilz_industrial_motion_planner_testutils/async_test.h
Outdated
Show resolved
Hide resolved
...dustrial_motion_planner_testutils/include/pilz_industrial_motion_planner_testutils/basecmd.h
Outdated
Show resolved
Hide resolved
..._planner_testutils/include/pilz_industrial_motion_planner_testutils/cartesianconfiguration.h
Outdated
Show resolved
Hide resolved
...testutils/include/pilz_industrial_motion_planner_testutils/cartesianpathconstraintsbuilder.h
Outdated
Show resolved
Hide resolved
...ndustrial_motion_planner_testutils/include/pilz_industrial_motion_planner_testutils/center.h
Outdated
Show resolved
Hide resolved
This is failing pre-commit again. Would you like me to fix it or would you like to try? There are instructions here for how to install and use it but the gist of it is what I told you earlier. You need to install clang-format-10 with pre-commit. Generally, I install clang-format-10 with apt and pre-commit with pip3 with the -U flag so it is installed into my home directory. |
just saw that, it showed passed when I ran it before pushing it. I tried again and it still shows passed on my machine. |
I ran pre-commit again same as before but it still seems that it isn't working? I don't understand where the problem is. |
I just pushed a commit that fixes the formating |
Previously you stated:
I bet you still don't have clang-format-10 installed which is what you need to fix the formatting. |
Signed-off-by: Tyler Weaver <tyler@picknik.ai>
7ba669b
to
fa87c38
Compare
Description
Please explain the changes you made, including a reference to the related issue if applicable
Checklist
It is my first contribution, I just thought this issue seems trivial enough to do, but I might have made some really dumb mistakes or messed up something completely, please let me know if I did any of that, and help me fix my mistakes please. From what I understood, I was just supposed to look through all header files and replace include guards with
#pragma once
but I am not sure if it was actually what I thought, sorry if what i did was dumb/wrong/bad, but please let me know the correct way of doing stuff so I don't mess up in future.PS- I don't know how to fill the checklist thing, not that it seems relevant for this issue but what am I supposed to put in the brackets?