Guard for shapes.h is the same as guard for geometric_shapes/shapes.h

[ana-GT]

Hi. I am working in a project where I am using both geometric_shapes/shapes.h and robot_self_filter/shapes.h . Both files have the exact same header guard: GEOMETRIC_SHAPES_SHAPES_ , which results in compilation errors as only one of the header files can be included at a time. Could it be possible to change the robot_self_filter/shapes.h guard to something like: ROBOT_SELF_FILTER_GEOMETRIC_SHAPES_? (or anything but GEOMETRIC_SHAPES_SHAPES_?)

I fix this problem by locally editing the guard in robot_self_filter/shapes.h , but my package needs to be distributed, so the local fix is not an ideal solution. Thanks!