iox-#1099 Revert rebase errors and removed unnecessary includes

Signed-off-by: Simon Hoinkis <[email protected]>
eclipse-iceoryx · Feb 28, 2022 · c7a6cb4 · c7a6cb4
1 parent f6a3831
commit c7a6cb4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/iceoryx_hoofs/include/iceoryx_hoofs/error_handling/error_handling.hpp b/iceoryx_hoofs/include/iceoryx_hoofs/error_handling/error_handling.hpp
@@ -20,17 +20,12 @@
 /// @todo #1099 rename this file to error_handler.hpp
 
 #include "iceoryx_hoofs/cxx/generic_raii.hpp"
-#include "iceoryx_hoofs/cxx/type_traits.hpp"
 #include "iceoryx_hoofs/log/logger.hpp"
 #include "iceoryx_hoofs/log/logging.hpp"
 #include "iceoryx_hoofs/log/logmanager.hpp"
 
-#include <cassert>
 #include <functional>
 #include <iostream>
-#include <mutex>
-#include <sstream>
-
 
 namespace iox
 {

diff --git a/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/mocks/error_handler_mock.hpp b/iceoryx_hoofs/testing/include/iceoryx_hoofs/testing/mocks/error_handler_mock.hpp
@@ -17,6 +17,7 @@
 #define IOX_HOOFS_TESTUTILS_ERROR_HANDLER_MOCK_HPP
 
 #include "iceoryx_hoofs/error_handling/error_handling.hpp"
+#include <mutex>
 
 #include "iceoryx_hoofs/testing/test.hpp"
 

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/chunk_queue_data.hpp
@@ -27,6 +27,8 @@
 #include "iceoryx_posh/internal/popo/building_blocks/condition_variable_data.hpp"
 #include "iceoryx_posh/popo/port_queue_policies.hpp"
 
+#include <mutex>
+
 namespace iox
 {
 namespace popo

diff --git a/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/typed_unique_id.hpp b/iceoryx_posh/include/iceoryx_posh/internal/popo/building_blocks/typed_unique_id.hpp
diff --git a/iceoryx_posh/test/moduletests/test_popo_sample.cpp b/iceoryx_posh/test/moduletests/test_popo_sample.cpp
@@ -90,4 +90,4 @@ TEST_F(Sample_test, PublishingMovedSampleCallsErrorHandler)
     ASSERT_THAT(detectedError.value(), Eq(iox::Error::kPOSH__PUBLISHING_EMPTY_SAMPLE));
 }
 
-} // namespace
+} // namespace