iox-eclipse-iceoryx#33 added static cast to help with template deduction; decltype in duration used for platform independent conversion; other windows platform tweaks

Signed-off-by: Christian Eltzschig <[email protected]>

Author: elfenpiff

iceoryx_utils/include/iceoryx_utils/cxx/smart_c.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include "iceoryx_utils/platform/platform-correction.hpp"
+
 #include <cstring>
 #include <initializer_list>
 #include <iostream>

iceoryx_utils/platform/win/include/iceoryx_utils/platform/semaphore.hpp

@@ -82,10 +82,10 @@ inline int sem_init(sem_t* sem, int pshared, unsigned int value)
     return -1;
 }
 
-// sem_t *
-// sem_open( const char *name, int oflag )
-//{
-//}
+inline sem_t* sem_open(const char* name, int oflag)
+{
+    return nullptr;
+}
 
 inline sem_t* sem_open(const char* name, int oflag, mode_t mode, unsigned int value)
 {

iceoryx_utils/source/posix_wrapper/semaphore.cpp

@@ -233,8 +233,12 @@ bool Semaphore::init(sem_t* handle, const int pshared, const unsigned int value)
 
 bool Semaphore::open(const int oflag) noexcept
 {
-    bool success = setHandleFromCall(cxx::makeSmartC(
-        sem_open, cxx::ReturnMode::PRE_DEFINED_ERROR_CODE, {static_cast<sem_t*>(SEM_FAILED)}, {}, m_name, oflag));
+    bool success = setHandleFromCall(cxx::makeSmartC(static_cast<sem_t* (*)(const char*, int)>(sem_open),
+                                                     cxx::ReturnMode::PRE_DEFINED_ERROR_CODE,
+                                                     {static_cast<sem_t*>(SEM_FAILED)},
+                                                     {},
+                                                     m_name,
+                                                     oflag));
 
     if (!success)
     {
@@ -245,14 +249,15 @@ bool Semaphore::open(const int oflag) noexcept
 
 bool Semaphore::open(const int oflag, const mode_t mode, const unsigned int value) noexcept
 {
-    bool success = setHandleFromCall(cxx::makeSmartC(sem_open,
-                                                     cxx::ReturnMode::PRE_DEFINED_ERROR_CODE,
-                                                     {static_cast<sem_t*>(SEM_FAILED)},
-                                                     {},
-                                                     m_name,
-                                                     oflag,
-                                                     mode,
-                                                     value));
+    bool success =
+        setHandleFromCall(cxx::makeSmartC(static_cast<sem_t* (*)(const char*, int, mode_t, unsigned int)>(sem_open),
+                                          cxx::ReturnMode::PRE_DEFINED_ERROR_CODE,
+                                          {static_cast<sem_t*>(SEM_FAILED)},
+                                          {},
+                                          m_name,
+                                          oflag,
+                                          mode,
+                                          value));
     if (!success)
     {
         m_errorValue = SemaphoreError::CREATION_FAILED;

iceoryx_utils/source/posix_wrapper/system_configuration.cpp

@@ -16,6 +16,7 @@
 
 #include "iceoryx_utils/cxx/smart_c.hpp"
 
+
 namespace iox
 {
 namespace posix

iceoryx_utils/source/units/duration.cpp

@@ -24,7 +24,8 @@ struct timespec Duration::timespec(const TimeSpecReference& reference) const
     switch (reference)
     {
     case TimeSpecReference::None:
-        return {this->seconds<int>(), static_cast<int>(this->nanoSeconds<int64_t>() - this->seconds<int64_t>() * 1000000000)};
+        return {this->seconds<int>(),
+                static_cast<int>(this->nanoSeconds<int64_t>() - this->seconds<int64_t>() * 1000000000)};
     default:
     {
         struct timespec referenceTime;
@@ -46,7 +47,8 @@ struct timespec Duration::timespec(const TimeSpecReference& reference) const
             int64_t seconds = this->seconds<int64_t>() + referenceTime.tv_sec + sumOfNanoSeconds / NanoSecondsPerSecond;
             int64_t nanoSeconds = sumOfNanoSeconds % NanoSecondsPerSecond;
 
-            return {seconds, nanoSeconds};
+            return {static_cast<decltype(referenceTime.tv_sec)>(seconds),
+                    static_cast<decltype(referenceTime.tv_nsec)>(nanoSeconds)};
         }
     }
     }