C++: accept non-null _root arg in the top-level type

Fixes the NavRootRecursive test for `cpp_stl_11` and `cpp_stl_98` - see kaitai-io/kaitai_struct_tests@5941262e78
kaitai-io · Apr 4, 2024 · 7fd4402 · 7fd4402
1 parent 751f059
commit 7fd4402
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala b/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala
@@ -199,7 +199,7 @@ class CppCompiler(
 
     handleAssignmentSimple(ParentIdentifier, pParent)
     handleAssignmentSimple(RootIdentifier, if (name == rootClassName) {
-      "this"
+      s"${pRoot} ? ${pRoot} : this"
     } else {
       pRoot
     })