Merge pull request #425 from LeStarch/issue-424

Fixing removing the nullptr from join calls
nasa · May 23, 2024 · 697603c · 697603c
2 parents 5de9bc1 + afa074e
commit 697603c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopHelperFns.scala b/compiler/lib/src/main/scala/codegen/CppWriter/TopologyCppWriter/TopHelperFns.scala
@@ -255,7 +255,7 @@ case class TopHelperFns(
       getCodeLinesForPhase (CppWriter.Phases.freeThreads) (ci).getOrElse {
         if (isActive(ci)) {
           val name = getNameAsIdent(ci.qualifiedName)
-          lines(s"(void) $name.ActiveComponentBase::join(nullptr);")
+          lines(s"(void) $name.ActiveComponentBase::join();")
         }
         else Nil
       }

diff --git a/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp b/compiler/tools/fpp-to-cpp/test/top/BasicTopologyAc.ref.cpp
@@ -110,9 +110,9 @@ namespace M {
   }
 
   void freeThreads(const TopologyState& state) {
-    (void) active1.ActiveComponentBase::join(nullptr);
+    (void) active1.ActiveComponentBase::join();
     active2.freeSpecial();
-    (void) active3.ActiveComponentBase::join(nullptr);
+    (void) active3.ActiveComponentBase::join();
   }
 
   void tearDownComponents(const TopologyState& state) {