iox-eclipse-iceoryx#32: moved platform types

marthtz · Jan 30, 2020 · 01b4da2 · 01b4da2
1 parent da51fe9
commit 01b4da2
Show file tree

Hide file tree

Showing 24 changed files with 24 additions and 25 deletions.
diff --git a/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi_lock.hpp b/iceoryx_posh/include/iceoryx_posh/internal/roudi/roudi_lock.hpp
@@ -16,11 +16,11 @@
 
 #include "iceoryx_posh/internal/log/posh_logging.hpp"
 #include "iceoryx_utils/cxx/smart_c.hpp"
+#include "iceoryx_utils/platform/types.hpp"
 
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 namespace iox

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/runtime/message_queue_interface.hpp b/iceoryx_posh/include/iceoryx_posh/internal/runtime/message_queue_interface.hpp
@@ -17,6 +17,7 @@
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_posh/internal/runtime/message_queue_message.hpp"
 #include "iceoryx_utils/internal/units/duration.hpp"
+#include "iceoryx_utils/platform/types.hpp"
 #include "iceoryx_utils/posix_wrapper/timer.hpp"
 
 #include <cstdint>
@@ -27,7 +28,6 @@
 #include <stdlib.h>
 #include <string>
 #include <sys/stat.h>
-#include <sys/types.h>
 #include <time.h>
 #include <unistd.h>
 

diff --git a/iceoryx_posh/source/roudi/application/roudi_app.cpp b/iceoryx_posh/source/roudi/application/roudi_app.cpp
@@ -28,7 +28,7 @@
 #include "stdio.h"
 #include <getopt.h>
 #include <pthread.h>
-#include <semaphore.h> // @todo: use semaphore wrapper
+#include "iceoryx_utils/platform/semaphore.hpp" // @todo: use semaphore wrapper
 #include <signal.h>
 #include <sys/resource.h>
 

diff --git a/iceoryx_posh/source/roudi/roudi_lock.cpp b/iceoryx_posh/source/roudi/roudi_lock.cpp
@@ -17,7 +17,6 @@
 #include <arpa/inet.h>
 #include <stdlib.h>
 #include <sys/socket.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 namespace iox

diff --git a/iceoryx_posh/test/moduletests/test_mepoo_segment.cpp b/iceoryx_posh/test/moduletests/test_mepoo_segment.cpp
@@ -12,18 +12,18 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "test.hpp"
-#include "test_definitions.hpp"
 #include "iceoryx_posh/internal/mepoo/memory_manager.hpp"
 #include "iceoryx_posh/internal/mepoo/mepoo_segment.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/shared_memory_object.hpp"
 #include "iceoryx_utils/internal/posix_wrapper/shared_memory_object/allocator.hpp"
+#include "iceoryx_utils/platform/types.hpp"
+#include "test.hpp"
+#include "test_definitions.hpp"
 
 #include <fcntl.h>
 #include <functional>
 #include <memory>
 #include <sys/stat.h>
-#include <sys/types.h>
 
 using namespace ::testing;
 using namespace iox::mepoo;

diff --git a/iceoryx_utils/include/iceoryx_utils/posix_wrapper/semaphore.hpp b/iceoryx_utils/include/iceoryx_utils/posix_wrapper/semaphore.hpp
@@ -21,7 +21,7 @@
 
 #include <cstring>
 #include <fcntl.h>
-#include "iceoryx_platform/semaphore.hpp"
+#include "iceoryx_utils/platform/semaphore.hpp"
 #include <sys/stat.h>
 
 namespace iox

diff --git a/...rm/linux/include/iceoryx_platform/acl.hpp → ...ux/include/iceoryx_utils/platform/acl.hpp b/...rm/linux/include/iceoryx_platform/acl.hpp → ...ux/include/iceoryx_utils/platform/acl.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...m/linux/include/iceoryx_platform/file.hpp → ...x/include/iceoryx_utils/platform/file.hpp b/...m/linux/include/iceoryx_platform/file.hpp → ...x/include/iceoryx_utils/platform/file.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...linux/include/iceoryx_platform/getopt.hpp → ...include/iceoryx_utils/platform/getopt.hpp b/...linux/include/iceoryx_platform/getopt.hpp → ...include/iceoryx_utils/platform/getopt.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...rm/linux/include/iceoryx_platform/grp.hpp → ...ux/include/iceoryx_utils/platform/grp.hpp b/...rm/linux/include/iceoryx_platform/grp.hpp → ...ux/include/iceoryx_utils/platform/grp.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...m/linux/include/iceoryx_platform/inet.hpp → ...x/include/iceoryx_utils/platform/inet.hpp b/...m/linux/include/iceoryx_platform/inet.hpp → ...x/include/iceoryx_utils/platform/inet.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...m/linux/include/iceoryx_platform/mman.hpp → ...x/include/iceoryx_utils/platform/mman.hpp b/...m/linux/include/iceoryx_platform/mman.hpp → ...x/include/iceoryx_utils/platform/mman.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...linux/include/iceoryx_platform/mqueue.hpp → ...include/iceoryx_utils/platform/mqueue.hpp b/...linux/include/iceoryx_platform/mqueue.hpp → ...include/iceoryx_utils/platform/mqueue.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/.../include/iceoryx_platform/posix_layer.hpp → ...de/iceoryx_utils/platform/posix_layer.hpp b/.../include/iceoryx_platform/posix_layer.hpp → ...de/iceoryx_utils/platform/posix_layer.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...inux/include/iceoryx_platform/pthread.hpp → ...nclude/iceoryx_utils/platform/pthread.hpp b/...inux/include/iceoryx_platform/pthread.hpp → ...nclude/iceoryx_utils/platform/pthread.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...rm/linux/include/iceoryx_platform/pwd.hpp → ...ux/include/iceoryx_utils/platform/pwd.hpp b/...rm/linux/include/iceoryx_platform/pwd.hpp → ...ux/include/iceoryx_utils/platform/pwd.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...nux/include/iceoryx_platform/resource.hpp → ...clude/iceoryx_utils/platform/resource.hpp b/...nux/include/iceoryx_platform/resource.hpp → ...clude/iceoryx_utils/platform/resource.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...ux/include/iceoryx_platform/semaphore.hpp → ...lude/iceoryx_utils/platform/semaphore.hpp b/...ux/include/iceoryx_platform/semaphore.hpp → ...lude/iceoryx_utils/platform/semaphore.hpp
diff --git a/...linux/include/iceoryx_platform/socket.hpp → ...include/iceoryx_utils/platform/socket.hpp b/...linux/include/iceoryx_platform/socket.hpp → ...include/iceoryx_utils/platform/socket.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...m/linux/include/iceoryx_platform/stat.hpp → ...x/include/iceoryx_utils/platform/stat.hpp b/...m/linux/include/iceoryx_platform/stat.hpp → ...x/include/iceoryx_utils/platform/stat.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include
diff --git a/...m/linux/include/iceoryx_platform/time.hpp → ...x/include/iceoryx_utils/platform/time.hpp b/...m/linux/include/iceoryx_platform/time.hpp → ...x/include/iceoryx_utils/platform/time.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include 
diff --git a/...linux/include/iceoryx_platform/_types.hpp → .../include/iceoryx_utils/platform/types.hpp b/...linux/include/iceoryx_platform/_types.hpp → .../include/iceoryx_utils/platform/types.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include <sys/types.h>
diff --git a/...linux/include/iceoryx_platform/unistd.hpp → ...include/iceoryx_utils/platform/unistd.hpp b/...linux/include/iceoryx_platform/unistd.hpp → ...include/iceoryx_utils/platform/unistd.hpp
@@ -14,4 +14,4 @@
 
 #pragma once
 
-#include <semaphore.h>
+#include
diff --git a/iceoryx_utils/source/posix_wrapper/posix_access_rights.cpp b/iceoryx_utils/source/posix_wrapper/posix_access_rights.cpp
@@ -14,11 +14,11 @@
 
 #include "iceoryx_utils/internal/posix_wrapper/posix_access_rights.hpp"
 #include "iceoryx_utils/cxx/smart_c.hpp"
+#include "iceoryx_utils/platform/types.hpp"
 
 #include <grp.h>
 #include <limits>
 #include <pwd.h>
-#include <sys/types.h>
 #include <unistd.h>
 
 namespace iox
Original file line number	Diff line number	Diff line change
Expand Up		@@ -14,4 +14,4 @@

		#pragma once

		#include <semaphore.h>
		#include