Release v2.4.0

* Add CMAKE configuration for C standard version (#340) * Add C standard configuration Signed-off-by: acuadros95 <acuadros1995@gmail.com> * Update C define Signed-off-by: acuadros95 <acuadros1995@gmail.com> * Remove CMAKE conditional Signed-off-by: acuadros95 <acuadros1995@gmail.com> --------- Signed-off-by: acuadros95 <acuadros1995@gmail.com> * Fix build for macOS (#346) * Add Twitter and Readthedocs shields (#307) (#308) * Add Twitter and Readthedocs shields Signed-off-by: Pablo Garrido <pablogs9@gmail.com> * Update Signed-off-by: Pablo Garrido <pablogs9@gmail.com> * Fix Signed-off-by: Pablo Garrido <pablogs9@gmail.com> (cherry picked from commit 8b78d22) Co-authored-by: Pablo Garrido <pablogs9@gmail.com> * Fix build for macOS - Add check for CMAKE_SYSTEM_NAME "Darwin". Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> --------- Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> Co-authored-by: Pablo Garrido <pablogs9@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> * Fix newline-eof compiler warning (#347) Add EOF newline to session.c. Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> * Fix doxygen warning (#352) * Remove outdated navindex tag Signed-off-by: acuadros95 <acuadros1995@gmail.com> * Revert unwanted removal Signed-off-by: acuadros95 <acuadros1995@gmail.com> --------- Signed-off-by: acuadros95 <acuadros1995@gmail.com> * Add missing doxygen parameter (#353) Signed-off-by: acuadros95 <acuadros1995@gmail.com> * Fix domain id argument in create_participant API (#348) --------- Signed-off-by: acuadros95 <acuadros1995@gmail.com> Signed-off-by: Rhys Mainwaring <rhys.mainwaring@me.com> Co-authored-by: Rhys Mainwaring <rhys.mainwaring@me.com> Co-authored-by: Pablo Garrido <pablogs9@gmail.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
eProsima · Mar 29, 2023 · a2937bc · a2937bc
2 parents 4b98d2d + 5cd43eb
commit a2937bc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -76,6 +76,8 @@ set(UCLIENT_HARD_LIVELINESS_CHECK_TIMEOUT 10000 CACHE STRING "Set the hard livel
 # Off-standard features and tweaks
 option(UCLIENT_TWEAK_XRCE_WRITE_LIMIT "This feature uses a tweak to allow XRCE WRITE DATA submessages grater than 64 kB." ON)
 
+set(UCLIENT_C_STANDARD 99 CACHE STRING "Version of the C language used to build the library")
+
 ###############################################################################
 # Dependencies
 ###############################################################################
@@ -90,7 +92,7 @@ list(APPEND _deps "microcdr\;${_microcdr_version}")
 ###############################################################################
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 if(NOT UCLIENT_SUPERBUILD)
-    project(microxrcedds_client VERSION "2.3.0" LANGUAGES C)
+    project(microxrcedds_client VERSION "2.4.0" LANGUAGES C)
 else()
     project(uclient_superbuild NONE)
     include(${PROJECT_SOURCE_DIR}/cmake/SuperBuild.cmake)
@@ -144,6 +146,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "Android")
     set(UCLIENT_PLATFORM_LINUX ON)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows")
     set(UCLIENT_PLATFORM_WINDOWS ON)
+elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+    set(UCLIENT_PLATFORM_MACOS ON)
 elseif(CMAKE_SYSTEM_NAME STREQUAL "Generic")
     if(PLATFORM_NAME STREQUAL "nuttx")
         set(UCLIENT_PLATFORM_NUTTX ON)
@@ -158,7 +162,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Generic")
     endif()
 endif()
 
-if(UCLIENT_PLATFORM_LINUX OR UCLIENT_PLATFORM_NUTTX OR UCLIENT_PLATFORM_ZEPHYR)
+if(UCLIENT_PLATFORM_LINUX OR UCLIENT_PLATFORM_MACOS OR UCLIENT_PLATFORM_NUTTX OR UCLIENT_PLATFORM_ZEPHYR)
     set(UCLIENT_PLATFORM_POSIX ON)
 endif()
 
@@ -319,7 +323,7 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
     SOVERSION
         ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}
     C_STANDARD
-        99
+        ${UCLIENT_C_STANDARD}
     C_STANDARD_REQUIRED
         YES
     POSITION_INDEPENDENT_CODE

diff --git a/include/uxr/client/core/session/create_entities_ref.h b/include/uxr/client/core/session/create_entities_ref.h
@@ -51,7 +51,7 @@ UXRDLLAPI uint16_t uxr_buffer_create_participant_ref(
         uxrSession* session,
         uxrStreamId stream_id,
         uxrObjectId object_id,
-        int16_t domain_id,
+        uint16_t domain_id,
         const char* ref,
         uint8_t mode);
 

diff --git a/include/uxr/client/core/session/session.h b/include/uxr/client/core/session/session.h
@@ -122,7 +122,7 @@ typedef void (* uxrOnRequestFunc) (
  * @param reply_id      Identifier of the reply.
  * @param ub            Serialized request data.
  * @param length        Length of the serialized data.
- * @param args		    User pointer data.
+ * @param args		User pointer data.
  */
 typedef void (* uxrOnReplyFunc) (
         struct uxrSession* session,
@@ -136,6 +136,7 @@ typedef void (* uxrOnReplyFunc) (
 /**
  * @brief Function signature used for flush_callback callbacks.
  * @param session   Session structure related to the buffer to be flushed.
+ * @param args	    Flush callback args pointer.
  */
 typedef bool (* uxrOnBuffersFull) (
         struct uxrSession* session,

diff --git a/src/c/core/session/create_entities_ref.c b/src/c/core/session/create_entities_ref.c
@@ -20,15 +20,15 @@ uint16_t uxr_buffer_create_participant_ref(
         uxrSession* session,
         uxrStreamId stream_id,
         uxrObjectId object_id,
-        int16_t domain_id,
+        uint16_t domain_id,
         const char* ref,
         uint8_t mode)
 {
     //assert with the object_id type
 
     CREATE_Payload payload;
     payload.object_representation.kind = DDS_XRCE_OBJK_PARTICIPANT;
-    payload.object_representation._.participant.domain_id = domain_id;
+    payload.object_representation._.participant.domain_id = (int16_t)domain_id;
 
     return create_entity_ref(session, stream_id, object_id, ref, mode, &payload);
 }

diff --git a/src/c/core/session/session.c b/src/c/core/session/session.c
@@ -1269,4 +1269,4 @@ bool run_session_until_sync(
     } while (remaining_time > 0 && !session->synchronized);
 
     return session->synchronized;
-}
+}
diff --git a/utils/doxygen/pages/DoxygenLayout.xml b/utils/doxygen/pages/DoxygenLayout.xml
@@ -18,8 +18,7 @@
       <tab type="filelist" visible="no" title="" intro=""/>
       <tab type="globals" visible="no" title="Functions" intro=""/>
     </tab>
-    <tab type="dirs" visible="no" title="" intro=""/>
-    <tab type="examples" visible="no" title="" intro=""/>  
+    <tab type="examples" visible="no" title="" intro=""/>
   </navindex>
 
    <!-- Layout definition for a group page -->
-Original file line number
+Diff line change
@@ Expand Up / @@ -1269,4 +1269,4 @@ bool run_session_until_sync( @@
         } while (remaining_time > 0 && !session->synchronized);
         return session->synchronized;
-    }
+    }