Move adaptor specific detail headers from ureact/adaptor/ to ureact/a…

…daptor/detail/
YarikTH · Oct 28, 2023 · 81f0493 · 81f0493
1 parent b0e78e2
commit 81f0493
Show file tree

Hide file tree

Showing 18 changed files with 28 additions and 28 deletions.
diff --git a/include/ureact/adaptor/adjacent.hpp b/include/ureact/adaptor/adjacent.hpp
@@ -10,8 +10,8 @@
 #ifndef UREACT_ADAPTOR_ADJACENT_HPP
 #define UREACT_ADAPTOR_ADJACENT_HPP
 
+#include <ureact/adaptor/detail/adjacent_base.hpp>
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/detail/adjacent_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/adjacent_filter.hpp b/include/ureact/adaptor/adjacent_filter.hpp
@@ -10,8 +10,8 @@
 #ifndef UREACT_ADAPTOR_ADJACENT_FILTER_HPP
 #define UREACT_ADAPTOR_ADJACENT_FILTER_HPP
 
+#include <ureact/adaptor/detail/adjacent_base.hpp>
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/detail/adjacent_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/adjacent_transform.hpp b/include/ureact/adaptor/adjacent_transform.hpp
@@ -10,8 +10,8 @@
 #ifndef UREACT_ADAPTOR_ADJACENT_TRANSFORM_HPP
 #define UREACT_ADAPTOR_ADJACENT_TRANSFORM_HPP
 
+#include <ureact/adaptor/detail/adjacent_base.hpp>
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/detail/adjacent_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/detail/adjacent_base.hpp → ...e/ureact/adaptor/detail/adjacent_base.hpp b/include/ureact/detail/adjacent_base.hpp → ...e/ureact/adaptor/detail/adjacent_base.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_DETAIL_ADJACENT_BASE_HPP
-#define UREACT_DETAIL_ADJACENT_BASE_HPP
+#ifndef UREACT_ADAPTOR_DETAIL_ADJACENT_BASE_HPP
+#define UREACT_ADAPTOR_DETAIL_ADJACENT_BASE_HPP
 
 #include <array>
 #include <functional>
@@ -205,4 +205,4 @@ class event_adjacent_node final
 
 UREACT_END_NAMESPACE
 
-#endif // UREACT_DETAIL_ADJACENT_BASE_HPP
+#endif // UREACT_ADAPTOR_DETAIL_ADJACENT_BASE_HPP
diff --git a/include/ureact/detail/reactive_op_base.hpp → ...react/adaptor/detail/reactive_op_base.hpp b/include/ureact/detail/reactive_op_base.hpp → ...react/adaptor/detail/reactive_op_base.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_DETAIL_REACTIVE_OP_BASE_HPP
-#define UREACT_DETAIL_REACTIVE_OP_BASE_HPP
+#ifndef UREACT_ADAPTOR_DETAIL_REACTIVE_OP_BASE_HPP
+#define UREACT_ADAPTOR_DETAIL_REACTIVE_OP_BASE_HPP
 
 #include <ureact/detail/linker_functor.hpp>
 #include <ureact/utility/type_traits.hpp>
@@ -64,4 +64,4 @@ class reactive_op_base
 
 UREACT_END_NAMESPACE
 
-#endif //UREACT_DETAIL_REACTIVE_OP_BASE_HPP
+#endif //UREACT_ADAPTOR_DETAIL_REACTIVE_OP_BASE_HPP
diff --git a/...ude/ureact/detail/synced_adaptor_base.hpp → ...ct/adaptor/detail/synced_adaptor_base.hpp b/...ude/ureact/detail/synced_adaptor_base.hpp → ...ct/adaptor/detail/synced_adaptor_base.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_DETAIL_SYNCED_ADAPTOR_BASE_HPP
-#define UREACT_DETAIL_SYNCED_ADAPTOR_BASE_HPP
+#ifndef UREACT_ADAPTOR_DETAIL_SYNCED_ADAPTOR_BASE_HPP
+#define UREACT_ADAPTOR_DETAIL_SYNCED_ADAPTOR_BASE_HPP
 
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/utility/signal_pack.hpp>
@@ -45,4 +45,4 @@ struct SyncedAdaptorBase : adaptor
 
 UREACT_END_NAMESPACE
 
-#endif // UREACT_DETAIL_SYNCED_ADAPTOR_BASE_HPP
+#endif // UREACT_ADAPTOR_DETAIL_SYNCED_ADAPTOR_BASE_HPP
diff --git a/include/ureact/detail/take_drop_base.hpp → .../ureact/adaptor/detail/take_drop_base.hpp b/include/ureact/detail/take_drop_base.hpp → .../ureact/adaptor/detail/take_drop_base.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_DETAIL_TAKE_DROP_BASE_HPP
-#define UREACT_DETAIL_TAKE_DROP_BASE_HPP
+#ifndef UREACT_ADAPTOR_DETAIL_TAKE_DROP_BASE_HPP
+#define UREACT_ADAPTOR_DETAIL_TAKE_DROP_BASE_HPP
 
 #include <cassert>
 #include <type_traits>
@@ -81,4 +81,4 @@ struct TakeDropAdaptorBase : adaptor
 
 UREACT_END_NAMESPACE
 
-#endif // UREACT_DETAIL_TAKE_DROP_BASE_HPP
+#endif // UREACT_ADAPTOR_DETAIL_TAKE_DROP_BASE_HPP
diff --git a/include/ureact/detail/zip_base.hpp → include/ureact/adaptor/detail/zip_base.hpp b/include/ureact/detail/zip_base.hpp → include/ureact/adaptor/detail/zip_base.hpp
@@ -7,8 +7,8 @@
 //          http://www.boost.org/LICENSE_1_0.txt)
 //
 
-#ifndef UREACT_DETAIL_ZIP_BASE_HPP
-#define UREACT_DETAIL_ZIP_BASE_HPP
+#ifndef UREACT_ADAPTOR_DETAIL_ZIP_BASE_HPP
+#define UREACT_ADAPTOR_DETAIL_ZIP_BASE_HPP
 
 #include <deque>
 #include <functional>
@@ -162,4 +162,4 @@ class event_zip_node final : public event_stream_node<zip_result_t<Type, F, Valu
 
 UREACT_END_NAMESPACE
 
-#endif // UREACT_DETAIL_ZIP_BASE_HPP
+#endif // UREACT_ADAPTOR_DETAIL_ZIP_BASE_HPP
diff --git a/include/ureact/adaptor/drop.hpp b/include/ureact/adaptor/drop.hpp
@@ -13,8 +13,8 @@
 #include <cassert>
 #include <type_traits>
 
+#include <ureact/adaptor/detail/take_drop_base.hpp>
 #include <ureact/adaptor/filter.hpp>
-#include <ureact/detail/take_drop_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/drop_while.hpp b/include/ureact/adaptor/drop_while.hpp
@@ -10,8 +10,8 @@
 #ifndef UREACT_ADAPTOR_DROP_WHILE_HPP
 #define UREACT_ADAPTOR_DROP_WHILE_HPP
 
+#include <ureact/adaptor/detail/synced_adaptor_base.hpp>
 #include <ureact/adaptor/filter.hpp>
-#include <ureact/detail/synced_adaptor_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/filter.hpp b/include/ureact/adaptor/filter.hpp
@@ -10,8 +10,8 @@
 #ifndef UREACT_ADAPTOR_FILTER_HPP
 #define UREACT_ADAPTOR_FILTER_HPP
 
+#include <ureact/adaptor/detail/synced_adaptor_base.hpp>
 #include <ureact/adaptor/process.hpp>
-#include <ureact/detail/synced_adaptor_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/lift.hpp b/include/ureact/adaptor/lift.hpp
@@ -13,9 +13,9 @@
 #include <cassert>
 #include <functional>
 
+#include <ureact/adaptor/detail/reactive_op_base.hpp>
 #include <ureact/detail/adaptor.hpp>
 #include <ureact/detail/deduce_result_type.hpp>
-#include <ureact/detail/reactive_op_base.hpp>
 #include <ureact/detail/temp_signal.hpp>
 #include <ureact/signal.hpp>
 #include <ureact/utility/signal_pack.hpp>

diff --git a/include/ureact/adaptor/slice.hpp b/include/ureact/adaptor/slice.hpp
@@ -13,8 +13,8 @@
 #include <cassert>
 #include <type_traits>
 
+#include <ureact/adaptor/detail/take_drop_base.hpp>
 #include <ureact/adaptor/filter.hpp>
-#include <ureact/detail/take_drop_base.hpp>
 #include <ureact/utility/type_traits.hpp>
 
 UREACT_BEGIN_NAMESPACE

diff --git a/include/ureact/adaptor/take.hpp b/include/ureact/adaptor/take.hpp
@@ -13,8 +13,8 @@
 #include <cassert>
 #include <type_traits>
 
+#include <ureact/adaptor/detail/take_drop_base.hpp>
 #include <ureact/adaptor/filter.hpp>
-#include <ureact/detail/take_drop_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/take_while.hpp b/include/ureact/adaptor/take_while.hpp
@@ -10,8 +10,8 @@
 #ifndef UREACT_ADAPTOR_TAKE_WHILE_HPP
 #define UREACT_ADAPTOR_TAKE_WHILE_HPP
 
+#include <ureact/adaptor/detail/synced_adaptor_base.hpp>
 #include <ureact/adaptor/filter.hpp>
-#include <ureact/detail/synced_adaptor_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/transform.hpp b/include/ureact/adaptor/transform.hpp
@@ -10,9 +10,9 @@
 #ifndef UREACT_ADAPTOR_TRANSFORM_HPP
 #define UREACT_ADAPTOR_TRANSFORM_HPP
 
+#include <ureact/adaptor/detail/synced_adaptor_base.hpp>
 #include <ureact/adaptor/process.hpp>
 #include <ureact/detail/deduce_result_type.hpp>
-#include <ureact/detail/synced_adaptor_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/zip.hpp b/include/ureact/adaptor/zip.hpp
@@ -10,8 +10,8 @@
 #ifndef UREACT_ADAPTOR_ZIP_HPP
 #define UREACT_ADAPTOR_ZIP_HPP
 
+#include <ureact/adaptor/detail/zip_base.hpp>
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/detail/zip_base.hpp>
 
 UREACT_BEGIN_NAMESPACE
 

diff --git a/include/ureact/adaptor/zip_transform.hpp b/include/ureact/adaptor/zip_transform.hpp
@@ -10,8 +10,8 @@
 #ifndef UREACT_ADAPTOR_ZIP_TRANSFORM_HPP
 #define UREACT_ADAPTOR_ZIP_TRANSFORM_HPP
 
+#include <ureact/adaptor/detail/zip_base.hpp>
 #include <ureact/detail/adaptor.hpp>
-#include <ureact/detail/zip_base.hpp>
 
 UREACT_BEGIN_NAMESPACE