Another set of fixes.

ferrandi · May 13, 2024 · efa4753 · efa4753
1 parent 21a367f
commit efa4753
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/HLS/function_allocation/fun_dominator_allocation.cpp b/src/HLS/function_allocation/fun_dominator_allocation.cpp
@@ -192,7 +192,7 @@ DesignFlowStep_Status fun_dominator_allocation::Exec()
             }
 
             if(!splitted.empty() && (fu_name == splitted.at(0) || splitted.at(0) == "*" ||
-                                     (splitted.at(0).max_size() > 1 && splitted.at(0).at(0) == '*' &&
+                                     (splitted.at(0).size() > 1 && splitted.at(0).at(0) == '*' &&
                                       fu_name.find(splitted.at(0).substr(1)) == 0)))
             {
                functions_constrained.insert(funid);

diff --git a/src/circuit/structural_objects.cpp b/src/circuit/structural_objects.cpp
@@ -4196,7 +4196,7 @@ void module::xload(const xml_element* Enode, structural_objectRef _owner, struct
          const xml_text_node* text = EnodeC->get_child_text();
          if(!text)
          {
-            THROW_WARNING("description is missing for " + EnodeC->get_name());
+            THROW_WARNING("description is missing for " + _owner->get_id());
          }
          else
          {
@@ -4209,7 +4209,7 @@ void module::xload(const xml_element* Enode, structural_objectRef _owner, struct
          const xml_text_node* text = EnodeC->get_child_text();
          if(!text)
          {
-            THROW_WARNING("copyright is missing for " + EnodeC->get_name());
+            THROW_WARNING("copyright is missing for " + _owner->get_id()));
          }
          else
          {
@@ -4222,7 +4222,7 @@ void module::xload(const xml_element* Enode, structural_objectRef _owner, struct
          const xml_text_node* text = EnodeC->get_child_text();
          if(!text)
          {
-            THROW_WARNING("authors are missing for " + EnodeC->get_name());
+            THROW_WARNING("authors are missing for " + _owner->get_id());
          }
          else
          {
@@ -4235,7 +4235,7 @@ void module::xload(const xml_element* Enode, structural_objectRef _owner, struct
          const xml_text_node* text = EnodeC->get_child_text();
          if(!text)
          {
-            THROW_WARNING("license is missing for " + EnodeC->get_name());
+            THROW_WARNING("license is missing for " + _owner->get_id());
          }
          else
          {
@@ -4248,7 +4248,7 @@ void module::xload(const xml_element* Enode, structural_objectRef _owner, struct
          const xml_text_node* text = EnodeC->get_child_text();
          if(!text)
          {
-            THROW_WARNING("specialization identifier is missing for " + EnodeC->get_name());
+            THROW_WARNING("specialization identifier is missing for " + _owner->get_id());
          }
          else
          {
@@ -4261,7 +4261,7 @@ void module::xload(const xml_element* Enode, structural_objectRef _owner, struct
          const xml_text_node* text = EnodeC->get_child_text();
          if(!text)
          {
-            THROW_WARNING("multi_unit_multiplicity identifier is missing for " + EnodeC->get_name());
+            THROW_WARNING("multi_unit_multiplicity identifier is missing for " + _owner->get_id());
          }
          else
          {
@@ -4275,7 +4275,7 @@ void module::xload(const xml_element* Enode, structural_objectRef _owner, struct
          const xml_text_node* text = EnodeC->get_child_text();
          if(!text)
          {
-            THROW_WARNING("keep_hierarchy identifier is missing for " + EnodeC->get_name());
+            THROW_WARNING("keep_hierarchy identifier is missing for " + _owner->get_id());
          }
          else
          {