Skip to content

Commit 576591a

Browse files
committed
fixup
Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>
1 parent db22521 commit 576591a

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

rcljava_common/include/rcljava_common/exceptions.hpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
/// and execute \a error_statement in that case.
4242
/**
4343
* The rcl error message will be added to \a base_message, and the rcl error state will be reset.
44-
*
44+
*
4545
* \param env a JNIEnv pointer, used to throw a java exception from the rcl error.
4646
* \param ret rcl_ret_t error that will be checked.
4747
* \param message error message that will be passed to the thrown exception.
@@ -52,9 +52,9 @@
5252
#define RCLJAVA_COMMON_THROW_FROM_RCL_X(env, ret, base_message, error_statement) \
5353
do { \
5454
if (RCL_RET_OK != ret) { \
55-
rcljava_common::exception::rcljava_throw_rclexception( \
56-
env, ret, static_cast<std::string>(message) + ": " + rcl_get_error_string().str); \
57-
rcl_reset_error();
55+
rcljava_common::exceptions::rcljava_throw_rclexception( \
56+
env, ret, static_cast<std::string>(base_message) + ": " + rcl_get_error_string().str); \
57+
rcl_reset_error(); \
5858
error_statement; \
5959
} \
6060
} while (0)
@@ -65,8 +65,8 @@
6565
* \param ret rcl_ret_t error that will be checked.
6666
* \param message error message that will be passed to the thrown exception.
6767
*/
68-
#define RCLJAVA_COMMON_THROW_FROM_RCL(env, ret, message) \
69-
RCLJAVA_COMMON_THROW_FROM_RCL_X(env, ret, message, return )
68+
#define RCLJAVA_COMMON_THROW_FROM_RCL(env, ret, base_message) \
69+
RCLJAVA_COMMON_THROW_FROM_RCL_X(env, ret, base_message, return )
7070

7171
namespace rcljava_common
7272
{

0 commit comments

Comments
 (0)