rename macros

Signed-off-by: Ivan Santiago Paunovic <ivanpauno@ekumenlabs.com>

Author: ivanpauno

rcljava_common/include/rcljava_common/exceptions.hpp

@@ -24,7 +24,7 @@
  * \param env a JNIEnv pointer, used to check for exceptions.
  * \param error_statement statement executed if an exception has happened.
  */
-#define RCLJAVA_COMMON_EXCEPTION_CHECK_X(env, error_statement) \
+#define RCLJAVA_COMMON_CHECK_FOR_EXCEPTION_WITH_ERROR_STATEMENT(env, error_statement) \
   do { \
     if (env->ExceptionCheck()) { \
       error_statement; \
@@ -35,7 +35,7 @@
 /**
  * \param env a JNIEnv pointer, used to check for exceptions.
  */
-#define RCLJAVA_COMMON_EXCEPTION_CHECK(env) RCLJAVA_COMMON_EXCEPTION_CHECK_X(env, return )
+#define RCLJAVA_COMMON_CHECK_FOR_EXCEPTION(env) RCLJAVA_COMMON_CHECK_FOR_EXCEPTION_WITH_STATEMENT(env, return )
 
 /// Call \ref rcljava_throw_rclexception if \a ret is not RCL_RET_OK,
 /// and execute \a error_statement in that case.
@@ -49,7 +49,7 @@
  *  \a base_message can be either a `const char *` or as `std::string`.
  * \param error_statement statement executed if ret was not RCL_RET_OK.
  */
-#define RCLJAVA_COMMON_THROW_FROM_RCL_X(env, ret, base_message, error_statement) \
+#define RCLJAVA_COMMON_THROW_FROM_RCL_WITH_ERROR_STATEMENT(env, ret, base_message, error_statement) \
   do { \
     if (RCL_RET_OK != ret) { \
       rcljava_common::exceptions::rcljava_throw_rclexception( \
@@ -66,7 +66,7 @@
  * \param base_message error message that will be passed to the thrown exception.
  */
 #define RCLJAVA_COMMON_THROW_FROM_RCL(env, ret, base_message) \
-  RCLJAVA_COMMON_THROW_FROM_RCL_X(env, ret, base_message, return )
+  RCLJAVA_COMMON_THROW_FROM_RCL_WITH_ERROR_STATEMENT(env, ret, base_message, return )
 
 namespace rcljava_common
 {