From a1c9fba0a2755d914122eff830d1a5f955d00e53 Mon Sep 17 00:00:00 2001
From: Petr Pucil <petr.pucil@seznam.cz>
Date: Wed, 12 Aug 2020 10:23:49 +0200
Subject: [PATCH] C++: no duplicate <memory> #includes, fix imports

See https://github.com/kaitai-io/kaitai_struct/issues/794
---
 .../scala/io/kaitai/struct/languages/CppCompiler.scala   | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala b/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala
index 18d949c88..0d01dbeb5 100644
--- a/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala
+++ b/shared/src/main/scala/io/kaitai/struct/languages/CppCompiler.scala
@@ -54,7 +54,6 @@ class CppCompiler(
     outSrcHeader.puts(s"// $headerComment")
     outSrcHeader.puts
 
-    importListSrc.addSystem("memory")
     importListSrc.addLocal(outFileNameHeader(topClassName))
 
     if (config.cppConfig.usePragmaOnce) {
@@ -109,13 +108,8 @@ class CppCompiler(
     }
   }
 
-  override def importFile(file: String): Unit = {
-    importListHdr.addLocal(outFileNameHeader(file))
-  }
-
   override def opaqueClassDeclaration(classSpec: ClassSpec): Unit = {
-    classForwardDeclaration(classSpec.name)
-    importListSrc.addLocal(outFileNameHeader(classSpec.name.head))
+    importListHdr.addLocal(outFileNameHeader(classSpec.name.head))
   }
 
   override def classHeader(name: List[String]): Unit = {
@@ -802,7 +796,6 @@ class CppCompiler(
           case SharedPointers =>
             s"std::make_shared<${types2class(t.name)}>($addParams$io$addArgs)"
           case UniqueAndRawPointers =>
-            importListSrc.addSystem("memory")
             // C++14
             //s"std::make_unique<${types2class(t.name)}>($addParams$io$addArgs)"
             s"std::unique_ptr<${types2class(t.name)}>(new ${types2class(t.name)}($addParams$io$addArgs))"