Fix gazebo8 warnings part 10: ifdefs for GetModel, GetEntity, Light (lunar-devel) #657
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
~~~ sed -i -e 's@.*->Light(.*@#if GAZEBO_MAJOR_VERSION >= 8\ __REPLACE__&\ \#else\ &\ \#endif@' gazebo_ros/src/gazebo_ros_api_plugin.cpp ~~~ ~~~ sed -i -e 's@^__REPLACE__\(.*\)->Light(\(.*\)@\1->LightByName(\2@' \ gazebo_ros/src/gazebo_ros_api_plugin.cpp ~~~
First ifdef the GetModel(int) calls with the following: ~~~ sed -i -e 's@.*GetModel(i).*@#if GAZEBO_MAJOR_VERSION >= 8\ __REPLACE__&\ \#else\ &\ \#endif ~~~ ~~~ sed -i -e 's@^__REPLACE__\(.*\)->ModelByIndex(i)\(.*\)@\1->GetModel(i)\2@' \ gazebo_ros/src/gazebo_ros_api_plugin.cpp ~~~ Then manually move the ifdefs to include for loops.
~~~
sed -i -e 's@.*->GetModel([^i].*@#if GAZEBO_MAJOR_VERSION >= 8\
__REPLACE__&\
\#else\
&\
\#endif@' `grep -rlI 'GetModel(' gazebo_*`
~~~
~~~
sed -i -e
's@^__REPLACE__\(.*\)->GetModel(\(.*\)@\1->ModelByName(\2@'
`grep -rlI 'GetModel(' gazebo_*`
~~~
Then manually merge with some ifdefs from LightByName
~~~
sed -i -e 's@.*->GetEntity.*@#if GAZEBO_MAJOR_VERSION >= 8\
__REPLACE__&\
\#else\
&\
\#endif@' `grep -rlI 'GetEntity' gazebo_*`
~~~
~~~
sed -i -e
's@^__REPLACE__\(.*\)->GetEntity(\(.*\)@\1->EntityByName(\2@'
`grep -rlI 'GetEntity(' gazebo_*`
~~~
cohen39
pushed a commit
to cohen39/gazebo_ros_pkgs
that referenced
this pull request
Nov 15, 2021
…lunar-devel) (ros-simulation#657) * gazebo8 warnings: ifdef World::Light(string) calls ~~~ sed -i -e 's@.*->Light(.*@#if GAZEBO_MAJOR_VERSION >= 8\ __REPLACE__&\ \#else\ &\ \#endif@' gazebo_ros/src/gazebo_ros_api_plugin.cpp ~~~ ~~~ sed -i -e 's@^__REPLACE__\(.*\)->Light(\(.*\)@\1->LightByName(\2@' \ gazebo_ros/src/gazebo_ros_api_plugin.cpp ~~~ * ifdef World::GetModel(int), World::GetModelCount() First ifdef the GetModel(int) calls with the following: ~~~ sed -i -e 's@.*GetModel(i).*@#if GAZEBO_MAJOR_VERSION >= 8\ __REPLACE__&\ \#else\ &\ \#endif ~~~ ~~~ sed -i -e 's@^__REPLACE__\(.*\)->ModelByIndex(i)\(.*\)@\1->GetModel(i)\2@' \ gazebo_ros/src/gazebo_ros_api_plugin.cpp ~~~ Then manually move the ifdefs to include for loops. * ifdef World::GetModel(string) ~~~ sed -i -e 's@.*->GetModel([^i].*@#if GAZEBO_MAJOR_VERSION >= 8\ __REPLACE__&\ \#else\ &\ \#endif@' `grep -rlI 'GetModel(' gazebo_*` ~~~ ~~~ sed -i -e 's@^__REPLACE__\(.*\)->GetModel(\(.*\)@\1->ModelByName(\2@' `grep -rlI 'GetModel(' gazebo_*` ~~~ Then manually merge with some ifdefs from LightByName * ifdef World::GetEntity(string) ~~~ sed -i -e 's@.*->GetEntity.*@#if GAZEBO_MAJOR_VERSION >= 8\ __REPLACE__&\ \#else\ &\ \#endif@' `grep -rlI 'GetEntity' gazebo_*` ~~~ ~~~ sed -i -e 's@^__REPLACE__\(.*\)->GetEntity(\(.*\)@\1->EntityByName(\2@' `grep -rlI 'GetEntity(' gazebo_*` ~~~ * merge some ifdefs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
{ port of pull request #656 }
This adds more ifdefs for functions that let you get pointers to physics objects, like Model, Entity, and Light. The only remaining warnings are from
World::GetSimTimeandWorld::GetPhysicsEngine.