Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Rename rcljava_common cpp headers to have .hpp suffix #93

Merged
merged 10 commits into from
Mar 18, 2020
Merged

Rename rcljava_common cpp headers to have .hpp suffix #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8f8a75b
Fix service and action interface generation
jacobperron Jan 30, 2020
6196b04
Add missing header include
jacobperron Feb 6, 2020
00260bf
Rename top level generated cpp file
jacobperron Feb 7, 2020
efaf468
Fix JNI name mangling function so it works for service and action sub…
jacobperron Feb 7, 2020
29d1eac
Remove vestigal references to jni_package_name
jacobperron Mar 4, 2020
97d0ead
Add comment about action and service headers
jacobperron Mar 4, 2020
dc5d64d
Simplify include logic
jacobperron Mar 4, 2020
589d1f9
Rename cpp headers to have .hpp suffix
jacobperron Mar 9, 2020
e795cdd
Update files to reflect new header suffix
jacobperron Mar 9, 2020
0e442f0
Merge branch 'dashing' into jacob/fix_cppcheck_error
esteve Mar 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_RCLJava.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#include "rmw/rmw.h"
#include "rosidl_generator_c/message_type_support_struct.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_RCLJava.h"

Expand Down
2 changes: 1 addition & 1 deletion rcljava/src/main/cpp/org_ros2_rcljava_Time.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#include "rcl/error_handling.h"
#include "rcl/rcl.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/exceptions.hpp"

#include "org_ros2_rcljava_Time.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_client_ClientImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include "rmw/rmw.h"
#include "rosidl_generator_c/message_type_support_struct.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_client_ClientImpl.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_contexts_ContextImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include "rcl/error_handling.h"
#include "rcl/init.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_contexts_ContextImpl.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_executors_BaseExecutor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
#include "rmw/rmw.h"
#include "rosidl_generator_c/message_type_support_struct.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_executors_BaseExecutor.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_node_NodeImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include "rmw/rmw.h"
#include "rosidl_generator_c/message_type_support_struct.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_node_NodeImpl.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_publisher_PublisherImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include "rcl/rcl.h"
#include "rmw/rmw.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_publisher_PublisherImpl.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_service_ServiceImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include "rmw/rmw.h"
#include "rosidl_generator_c/message_type_support_struct.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_service_ServiceImpl.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_subscription_SubscriptionImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include "rmw/rmw.h"
#include "rosidl_generator_c/message_type_support_struct.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_subscription_SubscriptionImpl.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_time_Clock.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
#include "rcl/error_handling.h"
#include "rcl/time.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_time_Clock.h"

Expand Down
4 changes: 2 additions & 2 deletions rcljava/src/main/cpp/org_ros2_rcljava_timer_WallTimerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
#include "rcl/rcl.h"
#include "rmw/rmw.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

#include "org_ros2_rcljava_timer_WallTimerImpl.h"

Expand Down
8 changes: 4 additions & 4 deletions ...ommon/include/rcljava_common/exceptions.h → ...mon/include/rcljava_common/exceptions.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef RCLJAVA_COMMON__EXCEPTIONS_H_
#define RCLJAVA_COMMON__EXCEPTIONS_H_
#ifndef RCLJAVA_COMMON__EXCEPTIONS_HPP_
#define RCLJAVA_COMMON__EXCEPTIONS_HPP_
#include <jni.h>

#include <string>

#include "rcljava_common/visibility_control.h"
#include "rcljava_common/visibility_control.hpp"

namespace rcljava_common
{
Expand All @@ -31,4 +31,4 @@ void rcljava_throw_exception(JNIEnv *, const char *, const std::string &);
} // namespace exceptions
} // namespace rcljava_common

#endif // RCLJAVA_COMMON__EXCEPTIONS_H_
#endif // RCLJAVA_COMMON__EXCEPTIONS_HPP_
6 changes: 3 additions & 3 deletions ...ommon/include/rcljava_common/signatures.h → ...mon/include/rcljava_common/signatures.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.
#ifndef RCLJAVA_COMMON__SIGNATURES_H_
#define RCLJAVA_COMMON__SIGNATURES_H_
#ifndef RCLJAVA_COMMON__SIGNATURES_HPP_
#define RCLJAVA_COMMON__SIGNATURES_HPP_
#include <jni.h>

#include <string>
Expand All @@ -29,4 +29,4 @@ using destroy_ros_message_signature = void (*)(void *);
} // namespace signatures
} // namespace rcljava_common

#endif // RCLJAVA_COMMON__SIGNATURES_H_
#endif // RCLJAVA_COMMON__SIGNATURES_HPP_
6 changes: 3 additions & 3 deletions ...clude/rcljava_common/visibility_control.h → ...ude/rcljava_common/visibility_control.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#ifndef RCLJAVA_COMMON__VISIBILITY_CONTROL_H_
#define RCLJAVA_COMMON__VISIBILITY_CONTROL_H_
#ifndef RCLJAVA_COMMON__VISIBILITY_CONTROL_HPP_
#define RCLJAVA_COMMON__VISIBILITY_CONTROL_HPP_

#ifdef __cplusplus
extern "C"
Expand Down Expand Up @@ -55,4 +55,4 @@ extern "C"
}
#endif

#endif // RCLJAVA_COMMON__VISIBILITY_CONTROL_H_
#endif // RCLJAVA_COMMON__VISIBILITY_CONTROL_HPP_
2 changes: 1 addition & 1 deletion rcljava_common/src/main/cpp/rcljava_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include <cassert>
#include <string>

#include "rcljava_common/exceptions.h"
#include "rcljava_common/exceptions.hpp"

namespace rcljava_common
{
Expand Down
4 changes: 2 additions & 2 deletions rosidl_generator_java/resource/msg.cpp.em
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,8 +102,8 @@ elif message_c_include_prefix.endswith('__feedback'):

#include "rosidl_generator_c/message_type_support_struct.h"

#include "rcljava_common/exceptions.h"
#include "rcljava_common/signatures.h"
#include "rcljava_common/exceptions.hpp"
#include "rcljava_common/signatures.hpp"

@[for include in member_includes]@
#include "@(include)"
Expand Down