From 40dbc7c4c2dec8ca780885027095e0db77f698e3 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Wed, 24 Sep 2014 10:35:15 +0200
Subject: [PATCH] Use cling fwd decl for typedefs for consistency (ROOT-6595).

---
 core/utils/src/rootcling.cxx | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/core/utils/src/rootcling.cxx b/core/utils/src/rootcling.cxx
index 699015f..31f90de 100644
--- a/core/utils/src/rootcling.cxx
+++ b/core/utils/src/rootcling.cxx
@@ -3449,22 +3449,13 @@ std::string GenerateFwdDeclString(const RScanner &scan,
                    selectedDecls.begin(),
                    [](const ROOT::TMetaUtils::AnnotatedRecordDecl& rcd){return rcd.GetRecordDecl();});
 
+   for (auto* TD: scan.fSelectedTypedefs)
+      selectedDecls.push_back(TD);
+
    fwdDeclString += "R\"DICTFWDDCLS(\n";
    fwdDeclString += Decls2FwdDecls(selectedDecls,interp);
    fwdDeclString += ")DICTFWDDCLS\"";
 
-   // Typedefs
-   for (auto const & tdNameDeclPtr : scan.fSelectedTypedefs) {
-      buffer = "";
-      int retCode = FwdDeclFromTypeDefNameDecl(*tdNameDeclPtr,
-                    interp,
-                    buffer,
-                    &fwdDecls);
-      if (retCode == 0 && fwdDecls.insert(buffer).second) {
-         fwdDeclString += "\nR\"FWDDECL(" + buffer + ")FWDDECL\"";
-      }
-   }
-
    // Functions
 //    for (auto const& fcnDeclPtr : scan.fSelectedFunctions){
 //       int retCode = FwdDeclFromFcnDecl(*fcnDeclPtr, interp, buffer);
-- 
1.8.2