Browse Source

process: basic_process_adaptor -> process_adaptor

skypjack 8 months ago
parent
commit
da684a4159

+ 1 - 8
src/entt/process/fwd.hpp

@@ -10,18 +10,11 @@ template<typename>
 class basic_process;
 class basic_process;
 
 
 template<typename, typename>
 template<typename, typename>
-struct basic_process_adaptor;
+struct process_adaptor;
 
 
 /*! @brief Alias declaration for the most common use case. */
 /*! @brief Alias declaration for the most common use case. */
 using process = basic_process<std::uint32_t>;
 using process = basic_process<std::uint32_t>;
 
 
-/**
- * @brief Alias declaration for the most common use case.
- * @tparam Func Actual type of process.
- */
-template<typename Func>
-using process_adaptor = basic_process_adaptor<std::uint32_t, Func>;
-
 template<typename, typename = std::allocator<void>>
 template<typename, typename = std::allocator<void>>
 class basic_scheduler;
 class basic_scheduler;
 
 

+ 3 - 3
src/entt/process/process.hpp

@@ -281,7 +281,7 @@ private:
  * @tparam Delta Type to use to provide elapsed time.
  * @tparam Delta Type to use to provide elapsed time.
  */
  */
 template<typename Delta, typename Func>
 template<typename Delta, typename Func>
-struct basic_process_adaptor: public basic_process<Delta> {
+struct process_adaptor: public basic_process<Delta> {
     /*! @brief Type used to provide elapsed time. */
     /*! @brief Type used to provide elapsed time. */
     using delta_type = typename basic_process<Delta>::delta_type;
     using delta_type = typename basic_process<Delta>::delta_type;
 
 
@@ -289,7 +289,7 @@ struct basic_process_adaptor: public basic_process<Delta> {
      * @brief Constructs a process adaptor from a lambda or a functor.
      * @brief Constructs a process adaptor from a lambda or a functor.
      * @param proc Actual process to use under the hood.
      * @param proc Actual process to use under the hood.
      */
      */
-    basic_process_adaptor(Func proc)
+    process_adaptor(Func proc)
         : basic_process<Delta>{},
         : basic_process<Delta>{},
           func{std::move(proc)} {}
           func{std::move(proc)} {}
 
 
@@ -311,7 +311,7 @@ private:
  * @tparam Func Actual type of process.
  * @tparam Func Actual type of process.
  */
  */
 template<typename Func>
 template<typename Func>
-basic_process_adaptor(Func) -> basic_process_adaptor<nth_argument_t<0u, Func>, Func>;
+process_adaptor(Func) -> process_adaptor<nth_argument_t<0u, Func>, Func>;
 
 
 } // namespace entt
 } // namespace entt
 
 

+ 2 - 2
src/entt/process/scheduler.hpp

@@ -234,7 +234,7 @@ public:
      */
      */
     template<typename Func>
     template<typename Func>
     basic_scheduler &attach(Func &&func) {
     basic_scheduler &attach(Func &&func) {
-        using Proc = basic_process_adaptor<Delta, std::decay_t<Func>>;
+        using Proc = process_adaptor<Delta, std::decay_t<Func>>;
         return attach<Proc>(std::forward<Func>(func));
         return attach<Proc>(std::forward<Func>(func));
     }
     }
 
 
@@ -266,7 +266,7 @@ public:
      */
      */
     template<typename Func>
     template<typename Func>
     basic_scheduler &then(Func &&func) {
     basic_scheduler &then(Func &&func) {
-        using Proc = basic_process_adaptor<Delta, std::decay_t<Func>>;
+        using Proc = process_adaptor<Delta, std::decay_t<Func>>;
         return then<Proc>(std::forward<Func>(func));
         return then<Proc>(std::forward<Func>(func));
     }
     }
 
 

+ 3 - 3
test/entt/process/process.cpp

@@ -207,7 +207,7 @@ TEST(ProcessAdaptor, Resolved) {
         proc.succeed();
         proc.succeed();
     };
     };
 
 
-    entt::basic_process_adaptor process{lambda};
+    entt::process_adaptor process{lambda};
 
 
     process.tick(0u);
     process.tick(0u);
     process.tick(0u);
     process.tick(0u);
@@ -224,7 +224,7 @@ TEST(ProcessAdaptor, Rejected) {
         proc.fail();
         proc.fail();
     };
     };
 
 
-    entt::basic_process_adaptor process{lambda};
+    entt::process_adaptor process{lambda};
 
 
     process.tick(0u);
     process.tick(0u);
     process.tick(0u);
     process.tick(0u);
@@ -240,7 +240,7 @@ TEST(ProcessAdaptor, Data) {
         proc.succeed();
         proc.succeed();
     };
     };
 
 
-    entt::basic_process_adaptor process{lambda};
+    entt::process_adaptor process{lambda};
 
 
     process.tick(0u, &value);
     process.tick(0u, &value);