Răsfoiți Sursa

registry: avoid embedding asserts with return expressions

Michele Caini 5 ani în urmă
părinte
comite
bd648c0745
1 a modificat fișierele cu 4 adăugiri și 2 ștergeri
  1. 4 2
      src/entt/entity/registry.hpp

+ 4 - 2
src/entt/entity/registry.hpp

@@ -1535,14 +1535,16 @@ public:
     template<typename Type>
     template<typename Type>
     [[nodiscard]] Type & ctx() const {
     [[nodiscard]] Type & ctx() const {
         auto it = std::find_if(vars.cbegin(), vars.cend(), [type = type_id<Type>()](auto &&var) { return var.type() == type; });
         auto it = std::find_if(vars.cbegin(), vars.cend(), [type = type_id<Type>()](auto &&var) { return var.type() == type; });
-        return (ENTT_ASSERT(it != vars.cend()), any_cast<Type &>(*it));
+        ENTT_ASSERT(it != vars.cend());
+        return any_cast<Type &>(*it);
     }
     }
 
 
     /*! @copydoc ctx */
     /*! @copydoc ctx */
     template<typename Type>
     template<typename Type>
     [[nodiscard]] Type & ctx() {
     [[nodiscard]] Type & ctx() {
         auto it = std::find_if(vars.begin(), vars.end(), [type = type_id<Type>()](auto &&var) { return var.type() == type; });
         auto it = std::find_if(vars.begin(), vars.end(), [type = type_id<Type>()](auto &&var) { return var.type() == type; });
-        return (ENTT_ASSERT(it != vars.end()), any_cast<Type &>(*it));
+        ENTT_ASSERT(it != vars.end());
+        return any_cast<Type &>(*it);
     }
     }
 
 
     /**
     /**