Преглед изворни кода

maybe_atomic_t no longer exists

Michele Caini пре 6 година
родитељ
комит
e93387b719
3 измењених фајлова са 4 додато и 6 уклоњено
  1. 2 4
      src/entt/config/config.h
  2. 1 1
      src/entt/core/family.hpp
  3. 1 1
      src/entt/core/monostate.hpp

+ 2 - 4
src/entt/config/config.h

@@ -14,11 +14,9 @@
 
 
 #ifndef ENTT_NO_ATOMIC
 #ifndef ENTT_NO_ATOMIC
 #include <atomic>
 #include <atomic>
-template<typename Type>
-using maybe_atomic_t = std::atomic<Type>;
+#define ENTT_MAYBE_ATOMIC(Type) std::atomic<Type>
 #else // ENTT_NO_ATOMIC
 #else // ENTT_NO_ATOMIC
-template<typename Type>
-using maybe_atomic_t = Type;
+#define ENTT_MAYBE_ATOMIC(Type) Type
 #endif // ENTT_NO_ATOMIC
 #endif // ENTT_NO_ATOMIC
 
 
 
 

+ 1 - 1
src/entt/core/family.hpp

@@ -18,7 +18,7 @@ namespace entt {
  */
  */
 template<typename...>
 template<typename...>
 class family {
 class family {
-    inline static maybe_atomic_t<ENTT_ID_TYPE> identifier;
+    inline static ENTT_MAYBE_ATOMIC(ENTT_ID_TYPE) identifier;
 
 
     template<typename...>
     template<typename...>
     inline static const auto inner = identifier++;
     inline static const auto inner = identifier++;

+ 1 - 1
src/entt/core/monostate.hpp

@@ -45,7 +45,7 @@ struct monostate {
 
 
 private:
 private:
     template<typename Type>
     template<typename Type>
-    inline static maybe_atomic_t<Type> value{};
+    inline static ENTT_MAYBE_ATOMIC(Type) value{};
 };
 };