Apply suggestions from code review

Co-authored-by: Vladimír Štill <git@vstill.eu>
p4lang · Feb 1, 2024 · f0331d3 · f0331d3
1 parent 2298ff1
commit f0331d3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/backends/p4tools/common/core/abstract_execution_state.cpp b/backends/p4tools/common/core/abstract_execution_state.cpp
@@ -101,7 +101,8 @@ const IR::Expression *AbstractExecutionState::convertToComplexExpression(
         IR::Vector<IR::Expression> components;
         const auto *elementType = resolveType(ts->elementType);
         for (size_t idx = 0; idx < ts->getSize(); idx++) {
-            auto ref = new IR::ArrayIndex(elementType, parent, new IR::Constant(uint64_t(idx)));
+            auto ref = new IR::ArrayIndex(elementType, parent,
+                                          new IR::Constant((static_cast<uint64_t>(idx))));
             if (elementType->is<IR::Type_StructLike>() || elementType->to<IR::Type_Stack>()) {
                 components.push_back(convertToComplexExpression(ref));
             } else {

diff --git a/ir/node.h b/ir/node.h
@@ -74,14 +74,14 @@ class INode : public Util::IHasSourceInfo, public IHasDbPrint, public ICastable
 
     // default checkedTo implementation for nodes: just fallback to generic ICastable method
     template <typename T>
-    typename std::enable_if_t<!has_static_type_name_v<T>, const T *> checkedTo() const {
+    std::enable_if_t<!has_static_type_name_v<T>, const T *> checkedTo() const {
         return ICastable::checkedTo<T>();
     }
 
     // alternative checkedTo implementation that produces slightly better error message
     // due to node_type_name() / static_type_name() being available
     template <typename T>
-    typename std::enable_if_t<has_static_type_name_v<T>, const T *> checkedTo() const {
+    std::enable_if_t<has_static_type_name_v<T>, const T *> checkedTo() const {
         const auto *result = to<T>();
         BUG_CHECK(result, "Cast failed: %1% with type %2% is not a %3%.", this, node_type_name(),
                   T::static_type_name());