Sfoglia il codice sorgente

minor changes here and there

Michele Caini 6 anni fa
parent
commit
f0dc882ae9

+ 1 - 5
TODO

@@ -25,10 +25,6 @@
   - ::group improve, reduce code
 
 * Mission: get rid of named types
-  - make it possible to use custom generators (eg for plugins)
-    * ENTT_ID_TYPE id() (eg dispatcher) can be a data member rather than a virtual function
-    * add discard pool functionality (+ test)
-  - use type_id also for groups, get rid of extent and subfunctions, is it possible?
+  - add discard pool functionality (+ test)
   - update doc: dispatcher, emitter, registry, meta, across boundaries
-  - update/improve/review tests
   - review and suppress warnings, if any

+ 1 - 2
src/entt/core/type_info.hpp

@@ -2,7 +2,6 @@
 #define ENTT_CORE_TYPE_INFO_HPP
 
 
-#include <type_traits>
 #include "../config/config.h"
 #include "hashed_string.hpp"
 
@@ -14,7 +13,7 @@ namespace entt {
  * @brief Types identifiers.
  * @tparam Type Type for which to generate an identifier.
  */
-template<typename Type, typename = std::void_t<>>
+template<typename Type, typename = void>
 struct type_id {
 #if defined _MSC_VER
     /**

+ 3 - 3
src/entt/core/type_traits.hpp

@@ -169,6 +169,9 @@ template<class Type>
 constexpr auto is_equality_comparable_v = is_equality_comparable<Type>::value;
 
 
+}
+
+
 /**
  * @brief Defines an enum class to use for opaque identifiers and a dedicate
  * `to_integer` function to convert the identifiers to their underlying type.
@@ -183,7 +186,4 @@ constexpr auto is_equality_comparable_v = is_equality_comparable<Type>::value;
     static_assert(true)
 
 
-}
-
-
 #endif // ENTT_CORE_TYPE_TRAITS_HPP

+ 1 - 1
src/entt/meta/factory.hpp

@@ -293,7 +293,7 @@ class meta_factory<Type, Spec...>: public meta_factory<Type> {
 
     template<std::size_t = 0, typename Key, typename... Value>
     void assign(Key &&key, Value &&... value) {
-        static auto property{std::make_tuple(std::forward<Key>(key), std::forward<Value>(value)...)};
+        static const auto property{std::make_tuple(std::forward<Key>(key), std::forward<Value>(value)...)};
 
         static internal::meta_prop_node node{
             nullptr,

+ 0 - 2
test/plugin/meta/plugin.cpp

@@ -37,8 +37,6 @@ CR_EXPORT int cr_main(cr_plugin *ctx, cr_op operation) {
         static_cast<userdata *>(ctx->userdata)->any = 42;
         break;
     case CR_UNLOAD:
-        // nothing to do here, this is only a test.
-        break;
     case CR_CLOSE:
         tear_down();
         break;