Fix: --cpp-ptr-type naked should not use '.get()' and '.reset()'

google · Apr 21, 2024 · 9118ea2 · 9118ea2
1 parent 7106d86
commit 9118ea2
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
@@ -3317,7 +3317,7 @@ class CppGenerator : public BaseGenerator {
             if (is_pointer) {
               code += "if(_o->" + name + "[_i]" + ") { ";
               code += indexing + "->UnPackTo(_o->" + name +
-                      "[_i].get(), _resolver);";
+                      "[_i]" + GenPtrGet(field) + ", _resolver);";
               code += " } else { ";
             }
             code += "_o->" + name + "[_i]" + access + " = ";
@@ -3376,14 +3376,14 @@ class CppGenerator : public BaseGenerator {
 
           if (is_pointer) {
             code += "{ if(" + out_field + ") { ";
-            code += "_e->UnPackTo(" + out_field + ".get(), _resolver);";
+            code += "_e->UnPackTo(" + out_field + GenPtrGet(field) + ", _resolver);";
             code += " } else { ";
           }
           code += out_field + " = ";
           code += GenUnpackVal(field.value.type, "_e", false, field) + ";";
           if (is_pointer) {
             code += " } } else if (" + out_field + ") { " + out_field +
-                    ".reset(); }";
+                    (PtrType(&field) == "naked"? " = nullptr": ".reset()") + "; }";
           }
         }
         break;