Merge pull request #39 from ros2/misra_fixup

Michael Carroll · web-flow · commit eda43306e7b2 · 2018-05-01T17:24:14.000-05:00
Change #if to #ifdef
diff --git a/rmw_implementation/src/functions.cpp b/rmw_implementation/src/functions.cpp
@@ -168,7 +168,7 @@ get_symbol(const char * symbol_name)
   return lib->getSymbol(symbol_name);
 }
 
-#if __cplusplus
+#ifdef __cplusplus
 extern "C"
 {
 #endif
@@ -417,6 +417,6 @@ rmw_init(void)
     rmw_init, rmw_ret_t, RMW_RET_ERROR, ARG_TYPES(void), ARG_VALUES_0())
 }
 
-#if __cplusplus
+#ifdef __cplusplus
 }
 #endif

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ get_symbol(const char * symbol_name)`
`168`	`168`	`return lib->getSymbol(symbol_name);`
`169`	`169`	`}`
`170`	`170`
`171`		`-#if __cplusplus`
	`171`	`+#ifdef __cplusplus`
`172`	`172`	`extern "C"`
`173`	`173`	`{`
`174`	`174`	`#endif`
`@@ -417,6 +417,6 @@ rmw_init(void)`
`417`	`417`	`rmw_init, rmw_ret_t, RMW_RET_ERROR, ARG_TYPES(void), ARG_VALUES_0())`
`418`	`418`	`}`
`419`	`419`
`420`		`-#if __cplusplus`
	`420`	`+#ifdef __cplusplus`
`421`	`421`	`}`
`422`	`422`	`#endif`