Merge pull request ros2#122 from ros2/remove_indent_off

remove obsolete INDENT-OFF usage
thomas-moulard · Sep 29, 2017 · 31ed2e5 · 31ed2e5
2 parents ac8ccc7 + e6dc443
commit 31ed2e5
Showing 1 changed file with 76 additions and 71 deletions.
diff --git a/rmw/include/rmw/impl/cpp/macros.hpp b/rmw/include/rmw/impl/cpp/macros.hpp
@@ -26,82 +26,87 @@
 #include "rmw/impl/config.h"  // For RMW_AVOID_MEMORY_ALLOCATION
 #include "rmw/impl/cpp/demangle.hpp"  // For demangle.
 
-// *INDENT-OFF* (prevent uncrustify from using four space indention here)
-#define RMW_TRY_PLACEMENT_NEW(Destination, BufferForNew, FailureAction, Type, ...) try { \
-  Destination = new(BufferForNew) Type(__VA_ARGS__); \
-} catch(const std::exception & exception) { \
-  RMW_SET_ERROR_MSG(( \
-    std::string("caught C++ exception ") + rmw::impl::cpp::demangle(exception) + \
-    " constructing " #Type ": " + exception.what() \
-  ).c_str()); \
-  FailureAction; \
-} catch(...) { \
-  RMW_SET_ERROR_MSG("caught unknown C++ exception constructing " #Type); \
-  FailureAction; \
-}
+#define RMW_TRY_PLACEMENT_NEW(Destination, BufferForNew, FailureAction, Type, ...) \
+  try { \
+    Destination = new(BufferForNew) Type(__VA_ARGS__); \
+  } catch (const std::exception & exception) { \
+    RMW_SET_ERROR_MSG( \
+      ( \
+        std::string("caught C++ exception ") + rmw::impl::cpp::demangle(exception) + \
+        " constructing " #Type ": " + exception.what() \
+      ).c_str()); \
+    FailureAction; \
+  } catch (...) { \
+    RMW_SET_ERROR_MSG("caught unknown C++ exception constructing " #Type); \
+    FailureAction; \
+  }
 
-#define RMW_TRY_DESTRUCTOR(Statement, Type, FailureAction) try { \
-  Statement; \
-} catch(const std::exception & exception) { \
-  RMW_SET_ERROR_MSG(( \
-    std::string("caught C++ exception in destructor of " #Type ": ") + \
-    rmw::impl::cpp::demangle(exception) + ": " + exception.what() \
-  ).c_str()); \
-  FailureAction; \
-} catch(...) { \
-  RMW_SET_ERROR_MSG("caught unknown C++ exception in destructor of " #Type); \
-  FailureAction; \
-}
+#define RMW_TRY_DESTRUCTOR(Statement, Type, FailureAction) \
+  try { \
+    Statement; \
+  } catch (const std::exception & exception) { \
+    RMW_SET_ERROR_MSG( \
+      ( \
+        std::string("caught C++ exception in destructor of " #Type ": ") + \
+        rmw::impl::cpp::demangle(exception) + ": " + exception.what() \
+      ).c_str()); \
+    FailureAction; \
+  } catch (...) { \
+    RMW_SET_ERROR_MSG("caught unknown C++ exception in destructor of " #Type); \
+    FailureAction; \
+  }
 
-#define RMW_TRY_DESTRUCTOR_FROM_WITHIN_FAILURE(Statement, Type) try { \
-  Statement; \
-} catch(const std::exception & exception) { \
-  std::stringstream ss; \
-  ss << "caught C++ exception in destructor of " #Type " while handling a failure: " \
-     << rmw::impl::cpp::demangle(exception) << ": " << exception.what() \
-     << ", at: " << __FILE__ << ":" << __LINE__ << '\n'; \
-  (std::cerr << ss.str()).flush(); \
-} catch(...) { \
-  std::stringstream ss; \
-  ss << "caught unknown C++ exception in destructor of " #Type \
-     << " while handling a failure at: " << __FILE__ << ":" << __LINE__ << '\n'; \
-  (std::cerr << ss.str()).flush(); \
-}
+#define RMW_TRY_DESTRUCTOR_FROM_WITHIN_FAILURE(Statement, Type) \
+  try { \
+    Statement; \
+  } catch (const std::exception & exception) { \
+    std::stringstream ss; \
+    ss << "caught C++ exception in destructor of " #Type " while handling a failure: " \
+       << rmw::impl::cpp::demangle(exception) << ": " << exception.what() \
+       << ", at: " << __FILE__ << ":" << __LINE__ << '\n'; \
+    (std::cerr << ss.str()).flush(); \
+  } catch (...) { \
+    std::stringstream ss; \
+    ss << "caught unknown C++ exception in destructor of " #Type << \
+      " while handling a failure at: " << __FILE__ << ":" << __LINE__ << '\n'; \
+    (std::cerr << ss.str()).flush(); \
+  }
 
 #if RMW_AVOID_MEMORY_ALLOCATION
-#define RMW_CHECK_TYPE_IDENTIFIERS_MATCH(ElementName, ElementTypeID, ExpectedTypeID, OnFailure) { \
-  if (ElementTypeID != ExpectedTypeID) { \
-    char __msg[1024]; \
-    rcutils_snprintf( \
-      __msg, 1024, \
-      #ElementName " implementation '%s'(%p) does not match rmw implementation '%s'(%p)", \
-      ElementTypeID, reinterpret_cast<const void *>(ElementTypeID), \
-      ExpectedTypeID, reinterpret_cast<const void *>(ExpectedTypeID)); \
-    RMW_SET_ERROR_MSG(__msg); \
-    OnFailure; \
-  } \
-}
+#define RMW_CHECK_TYPE_IDENTIFIERS_MATCH(ElementName, ElementTypeID, ExpectedTypeID, OnFailure) \
+  { \
+    if (ElementTypeID != ExpectedTypeID) { \
+      char __msg[1024]; \
+      rcutils_snprintf( \
+        __msg, 1024, \
+        #ElementName " implementation '%s'(%p) does not match rmw implementation '%s'(%p)", \
+        ElementTypeID, reinterpret_cast<const void *>(ElementTypeID), \
+        ExpectedTypeID, reinterpret_cast<const void *>(ExpectedTypeID)); \
+      RMW_SET_ERROR_MSG(__msg); \
+      OnFailure; \
+    } \
+  }
 #else  // RMW_AVOID_MEMORY_ALLOCATION
-#define RMW_CHECK_TYPE_IDENTIFIERS_MATCH(ElementName, ElementTypeID, ExpectedTypeID, OnFailure) { \
-  if (ElementTypeID != ExpectedTypeID) { \
-    size_t __bytes_that_would_have_been_written = rcutils_snprintf( \
-      NULL, 0, \
-      #ElementName " implementation '%s'(%p) does not match rmw implementation '%s'(%p)", \
-      ElementTypeID, reinterpret_cast<const void *>(ElementTypeID), \
-      ExpectedTypeID, reinterpret_cast<const void *>(ExpectedTypeID)); \
-    char * __msg = \
-      reinterpret_cast<char *>(rmw_allocate(__bytes_that_would_have_been_written + 1)); \
-    rcutils_snprintf( \
-      __msg, __bytes_that_would_have_been_written + 1, \
-      #ElementName " implementation '%s'(%p) does not match rmw implementation '%s'(%p)", \
-      ElementTypeID, reinterpret_cast<const void *>(ElementTypeID), \
-      ExpectedTypeID, reinterpret_cast<const void *>(ExpectedTypeID)); \
-    RMW_SET_ERROR_MSG(__msg); \
-    rmw_free(__msg); \
-    OnFailure; \
-  } \
-}
+#define RMW_CHECK_TYPE_IDENTIFIERS_MATCH(ElementName, ElementTypeID, ExpectedTypeID, OnFailure) \
+  { \
+    if (ElementTypeID != ExpectedTypeID) { \
+      size_t __bytes_that_would_have_been_written = rcutils_snprintf( \
+        NULL, 0, \
+        #ElementName " implementation '%s'(%p) does not match rmw implementation '%s'(%p)", \
+        ElementTypeID, reinterpret_cast<const void *>(ElementTypeID), \
+        ExpectedTypeID, reinterpret_cast<const void *>(ExpectedTypeID)); \
+      char * __msg = \
+        reinterpret_cast<char *>(rmw_allocate(__bytes_that_would_have_been_written + 1)); \
+      rcutils_snprintf( \
+        __msg, __bytes_that_would_have_been_written + 1, \
+        #ElementName " implementation '%s'(%p) does not match rmw implementation '%s'(%p)", \
+        ElementTypeID, reinterpret_cast<const void *>(ElementTypeID), \
+        ExpectedTypeID, reinterpret_cast<const void *>(ExpectedTypeID)); \
+      RMW_SET_ERROR_MSG(__msg); \
+      rmw_free(__msg); \
+      OnFailure; \
+    } \
+  }
 #endif  // RMW_AVOID_MEMORY_ALLOCATION
-// *INDENT-ON*
 
 #endif  // RMW__IMPL__CPP__MACROS_HPP_