Reuse C++ typesupport in C services

ros2 · Mar 2, 2016 · f645b49 · f645b49
1 parent 0935471
commit f645b49
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 498 deletions.
diff --git a/rosidl_typesupport_opensplice_c/resource/msg__type_support_c.cpp.template b/rosidl_typesupport_opensplice_c/resource/msg__type_support_c.cpp.template
@@ -187,8 +187,7 @@ convert_ros_to_dds(const void * untyped_ros_message, void * untyped_dds_message)
       if (!str) {
         return "string field was not allocated";
       }
-      // TODO revert
-      if (/*!(str->capacity == 0 && str->size == 0) &&*/ str->capacity <= str->size) {
+      if (str->capacity == 0 || str->capacity <= str->size) {
         return "string capacity not greater than size";
       }
       if (!str->data) {
@@ -216,8 +215,7 @@ convert_ros_to_dds(const void * untyped_ros_message, void * untyped_dds_message)
     if (!str) {
       return "string field was not allocated";
     }
-    //if (/*str->capacity == 0 ||*/ str->capacity <= str->size) {
-    if (!(str->capacity == 0 && str->size == 0) && str->capacity <= str->size) {
+    if (str->capacity == 0 || str->capacity <= str->size) {
       return "string capacity not greater than size";
     }
     if (!str->data) {