iox-eclipse-iceoryx#218 Rename experimental api to modern api.

Signed-off-by: Ithier Jeff (CC-AD/EYF1) <[email protected]>
elBoberido · Sep 24, 2020 · d40cddd · d40cddd
1 parent f359f7e
commit d40cddd
Show file tree

Hide file tree

Showing 28 changed files with 40 additions and 37 deletions.
diff --git a/iceoryx_examples/icedelivery/CMakeLists.txt b/iceoryx_examples/icedelivery/CMakeLists.txt
@@ -52,21 +52,21 @@ set_target_properties(iox-ex-subscriber-simple PROPERTIES
 )
 
 
-add_executable(iox-ex-publisher-typed-experimental ./iox_publisher_typed_experimental.cpp)
-target_link_libraries(iox-ex-publisher-typed-experimental
+add_executable(iox-ex-publisher-typed-modern ./iox_publisher_typed_modern.cpp)
+target_link_libraries(iox-ex-publisher-typed-modern
  iceoryx_posh::iceoryx_posh
 )
-set_target_properties(iox-ex-publisher-typed-experimental PROPERTIES
+set_target_properties(iox-ex-publisher-typed-modern PROPERTIES
  CXX_STANDARD_REQUIRED ON
  CXX_STANDARD ${ICEORYX_CXX_STANDARD}
  POSITION_INDEPENDENT_CODE ON
 )
 
-add_executable(iox-ex-publisher-untyped-experimental ./iox_publisher_untyped_experimental.cpp)
-target_link_libraries(iox-ex-publisher-untyped-experimental
+add_executable(iox-ex-publisher-untyped-modern ./iox_publisher_untyped_modern.cpp)
+target_link_libraries(iox-ex-publisher-untyped-modern
  iceoryx_posh::iceoryx_posh
 )
-set_target_properties(iox-ex-publisher-untyped-experimental PROPERTIES
+set_target_properties(iox-ex-publisher-untyped-modern PROPERTIES
  CXX_STANDARD_REQUIRED ON
  CXX_STANDARD ${ICEORYX_CXX_STANDARD}
  POSITION_INDEPENDENT_CODE ON

diff --git a/...very/iox_publisher_typed_experimental.cpp → ...cedelivery/iox_publisher_typed_modern.cpp b/...very/iox_publisher_typed_experimental.cpp → ...cedelivery/iox_publisher_typed_modern.cpp
@@ -14,7 +14,7 @@
 
 #include "topic_data.hpp"
 
-#include "iceoryx_posh/experimental/popo/publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <chrono>

diff --git a/...ry/iox_publisher_untyped_experimental.cpp → ...delivery/iox_publisher_untyped_modern.cpp b/...ry/iox_publisher_untyped_experimental.cpp → ...delivery/iox_publisher_untyped_modern.cpp
@@ -14,7 +14,7 @@
 
 #include "topic_data.hpp"
 
-#include "iceoryx_posh/experimental/popo/publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/publisher.hpp"
 #include "iceoryx_posh/runtime/posh_runtime.hpp"
 
 #include <chrono>

diff --git a/...rimental/internal/popo/base_publisher.inl → ...ternal/popo/modern_api/base_publisher.inl b/...rimental/internal/popo/base_publisher.inl → ...ternal/popo/modern_api/base_publisher.inl
diff --git a/...imental/internal/popo/base_subscriber.inl → ...ernal/popo/modern_api/base_subscriber.inl b/...imental/internal/popo/base_subscriber.inl → ...ernal/popo/modern_api/base_subscriber.inl
diff --git a/...osh/experimental/internal/popo/sample.inl → ..._posh/internal/popo/modern_api/sample.inl b/...osh/experimental/internal/popo/sample.inl → ..._posh/internal/popo/modern_api/sample.inl
diff --git a/...imental/internal/popo/typed_publisher.inl → ...ernal/popo/modern_api/typed_publisher.inl b/...imental/internal/popo/typed_publisher.inl → ...ernal/popo/modern_api/typed_publisher.inl
diff --git a/...mental/internal/popo/typed_subscriber.inl → ...rnal/popo/modern_api/typed_subscriber.inl b/...mental/internal/popo/typed_subscriber.inl → ...rnal/popo/modern_api/typed_subscriber.inl
diff --git a/...ental/internal/popo/untyped_publisher.inl → ...nal/popo/modern_api/untyped_publisher.inl b/...ental/internal/popo/untyped_publisher.inl → ...nal/popo/modern_api/untyped_publisher.inl
diff --git a/...ntal/internal/popo/untyped_subscriber.inl → ...al/popo/modern_api/untyped_subscriber.inl b/...ntal/internal/popo/untyped_subscriber.inl → ...al/popo/modern_api/untyped_subscriber.inl
diff --git a/...posh/experimental/popo/base_publisher.hpp → ...x_posh/popo/modern_api/base_publisher.hpp b/...posh/experimental/popo/base_publisher.hpp → ...x_posh/popo/modern_api/base_publisher.hpp
@@ -15,8 +15,10 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_BASE_PUBLISHER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_BASE_PUBLISHER_HPP
 
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_posh/internal/popo/ports/publisher_port_user.hpp"
+#include "iceoryx_utils/cxx/expected.hpp"
+#include "iceoryx_utils/cxx/optional.hpp"
 
 namespace iox
 {
@@ -120,6 +122,6 @@ class BasePublisher : public PublisherInterface<T>
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/base_publisher.inl"
+#include "iceoryx_posh/internal/popo/modern_api/base_publisher.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_BASE_PUBLISHER_HPP
diff --git a/...osh/experimental/popo/base_subscriber.hpp → ..._posh/popo/modern_api/base_subscriber.hpp b/...osh/experimental/popo/base_subscriber.hpp → ..._posh/popo/modern_api/base_subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_BASE_SUBSCRIBER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_BASE_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_posh/internal/popo/ports/subscriber_port_user.hpp"
 #include "iceoryx_posh/popo/condition.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
@@ -102,6 +102,6 @@ class BaseSubscriber : public Condition
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/base_subscriber.inl"
+#include "iceoryx_posh/internal/popo/modern_api/base_subscriber.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_BASE_SUBSCRIBER_HPP
diff --git a/...oryx_posh/experimental/popo/publisher.hpp → ...ceoryx_posh/popo/modern_api/publisher.hpp b/...oryx_posh/experimental/popo/publisher.hpp → ...ceoryx_posh/popo/modern_api/publisher.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_PUBLISHER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_PUBLISHER_HPP
 
-#include "iceoryx_posh/experimental/popo/typed_publisher.hpp"
-#include "iceoryx_posh/experimental/popo/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_PUBLISHER_HPP
diff --git a/...iceoryx_posh/experimental/popo/sample.hpp → ...e/iceoryx_posh/popo/modern_api/sample.hpp b/...iceoryx_posh/experimental/popo/sample.hpp → ...e/iceoryx_posh/popo/modern_api/sample.hpp
@@ -99,6 +99,6 @@ class Sample<const T>
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/sample.inl"
+#include "iceoryx_posh/internal/popo/modern_api/sample.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_SAMPLE_HPP
diff --git a/...ryx_posh/experimental/popo/subscriber.hpp → ...eoryx_posh/popo/modern_api/subscriber.hpp b/...ryx_posh/experimental/popo/subscriber.hpp → ...eoryx_posh/popo/modern_api/subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_SUBSCRIBER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/experimental/popo/typed_subscriber.hpp"
-#include "iceoryx_posh/experimental/popo/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_SUBSCRIBER_HPP
diff --git a/...osh/experimental/popo/typed_publisher.hpp → ..._posh/popo/modern_api/typed_publisher.hpp b/...osh/experimental/popo/typed_publisher.hpp → ..._posh/popo/modern_api/typed_publisher.hpp
@@ -15,8 +15,8 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_TYPED_PUBLISHER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_TYPED_PUBLISHER_HPP
 
-#include "iceoryx_posh/experimental/popo/base_publisher.hpp"
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_utils/cxx/type_traits.hpp"
 
 namespace iox
@@ -67,6 +67,6 @@ class TypedPublisher : public base_publisher_t
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/typed_publisher.inl"
+#include "iceoryx_posh/internal/popo/modern_api/typed_publisher.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_TYPED_PUBLISHER_HPP
diff --git a/...sh/experimental/popo/typed_subscriber.hpp → ...posh/popo/modern_api/typed_subscriber.hpp b/...sh/experimental/popo/typed_subscriber.hpp → ...posh/popo/modern_api/typed_subscriber.hpp
@@ -15,7 +15,7 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_TYPED_SUBSCRIBER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_TYPED_SUBSCRIBER_HPP
 
-#include "iceoryx_posh/experimental/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
 
 namespace iox
 {
@@ -49,6 +49,6 @@ class TypedSubscriber : public base_subscriber_t
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/typed_subscriber.inl"
+#include "iceoryx_posh/internal/popo/modern_api/typed_subscriber.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_TYPED_SUBSCRIBER_HPP
diff --git a/...h/experimental/popo/untyped_publisher.hpp → ...osh/popo/modern_api/untyped_publisher.hpp b/...h/experimental/popo/untyped_publisher.hpp → ...osh/popo/modern_api/untyped_publisher.hpp
@@ -15,8 +15,8 @@
 #ifndef IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_PUBLISHER_HPP
 #define IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_PUBLISHER_HPP
 
-#include "iceoryx_posh/experimental/popo/base_publisher.hpp"
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 
 namespace iox
 {
@@ -56,6 +56,6 @@ using UntypedPublisher = UntypedPublisherImpl<>;
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/untyped_publisher.inl"
+#include "iceoryx_posh/internal/popo/modern_api/untyped_publisher.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_PUBLISHER_HPP
diff --git a/.../experimental/popo/untyped_subscriber.hpp → ...sh/popo/modern_api/untyped_subscriber.hpp b/.../experimental/popo/untyped_subscriber.hpp → ...sh/popo/modern_api/untyped_subscriber.hpp
@@ -16,7 +16,7 @@
 #define IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_SUBSCRIBER_HPP
 
 #include "iceoryx_posh/capro/service_description.hpp"
-#include "iceoryx_posh/experimental/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/unique_ptr.hpp"
 
@@ -53,6 +53,6 @@ using UntypedSubscriber = UntypedSubscriberImpl<>;
 } // namespace popo
 } // namespace iox
 
-#include "iceoryx_posh/experimental/internal/popo/untyped_subscriber.inl"
+#include "iceoryx_posh/internal/popo/modern_api/untyped_subscriber.inl"
 
 #endif // IOX_EXPERIMENTAL_POSH_POPO_UNTYPED_SUBSCRIBER_HPP
diff --git a/iceoryx_posh/test/mocks/publisher_mock.hpp b/iceoryx_posh/test/mocks/publisher_mock.hpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/base_publisher.hpp"
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 
 #include "test.hpp"

diff --git a/iceoryx_posh/test/mocks/subscriber_mock.hpp b/iceoryx_posh/test/mocks/subscriber_mock.hpp
@@ -12,7 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "iceoryx_posh/mepoo/chunk_header.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_base_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/base_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/base_publisher.hpp"
 #include "mocks/publisher_mock.hpp"
 
 #include "test.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_base_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/base_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/base_subscriber.hpp"
 #include "iceoryx_posh/iceoryx_posh_types.hpp"
 #include "iceoryx_utils/cxx/expected.hpp"
 #include "iceoryx_utils/cxx/optional.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_sample.cpp b/iceoryx_posh/test/moduletests/test_popo_sample.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/sample.hpp"
+#include "iceoryx_posh/popo/modern_api/sample.hpp"
 #include "test.hpp"
 
 using namespace ::testing;

diff --git a/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_typed_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/typed_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/typed_publisher.hpp"
 #include "mocks/publisher_mock.hpp"
 
 #include "test.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_typed_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/typed_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/typed_subscriber.hpp"
 #include "mocks/subscriber_mock.hpp"
 
 #include "test.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp b/iceoryx_posh/test/moduletests/test_popo_untyped_publisher.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/untyped_publisher.hpp"
+#include "iceoryx_posh/popo/modern_api/untyped_publisher.hpp"
 #include "mocks/publisher_mock.hpp"
 
 #include "test.hpp"

diff --git a/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp b/iceoryx_posh/test/moduletests/test_popo_untyped_subscriber.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "iceoryx_posh/experimental/popo/untyped_subscriber.hpp"
+#include "iceoryx_posh/popo/modern_api/untyped_subscriber.hpp"
 #include "mocks/subscriber_mock.hpp"
 
 #include "test.hpp"