From 27afbef474b7f7c3818dc071a212db5e15509759 Mon Sep 17 00:00:00 2001
From: Axel Naumann <Axel.Naumann@cern.ch>
Date: Wed, 14 Dec 2016 18:03:43 +0100
Subject: [PATCH] Follow rename of TMetaUtils.h->TClingUtils.h.

---
 core/clingutils/res/RStl.h                    | 2 +-
 core/clingutils/src/RConversionRuleParser.cxx | 2 +-
 core/clingutils/src/RStl.cxx                  | 2 +-
 core/clingutils/src/TClingUtils.cxx           | 2 +-
 core/dictgen/res/BaseSelectionRule.h          | 2 --
 core/dictgen/res/LinkdefReader.h              | 2 +-
 core/dictgen/res/Scanner.h                    | 2 +-
 core/dictgen/res/SelectionRules.h             | 2 +-
 core/dictgen/src/BaseSelectionRule.cxx        | 3 +++
 core/dictgen/src/DictSelectionReader.cxx      | 2 +-
 core/dictgen/src/TModuleGenerator.cxx         | 2 +-
 core/dictgen/src/XMLReader.cxx                | 2 +-
 core/dictgen/src/rootcling_impl.cxx           | 2 +-
 core/metacling/src/TCling.cxx                 | 2 +-
 core/metacling/src/TClingBaseClassInfo.cxx    | 2 +-
 core/metacling/src/TClingCallFunc.cxx         | 2 +-
 core/metacling/src/TClingCallbacks.cxx        | 2 +-
 core/metacling/src/TClingClassInfo.cxx        | 2 +-
 core/metacling/src/TClingDataMemberInfo.cxx   | 2 +-
 core/metacling/src/TClingMethodInfo.cxx       | 2 +-
 core/metacling/src/TClingTypeInfo.cxx         | 2 +-
 core/metacling/src/TClingTypedefInfo.cxx      | 2 +-
 core/metacling/src/rootclingTCling.cxx        | 2 +-
 23 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/core/clingutils/res/RStl.h b/core/clingutils/res/RStl.h
index 6008e659d23..f44d3f20454 100644
--- a/core/clingutils/res/RStl.h
+++ b/core/clingutils/res/RStl.h
@@ -26,7 +26,7 @@
 #include <string>
 #include <set>
 
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 
 namespace clang {
    class CXXRecordDecl;
diff --git a/core/clingutils/src/RConversionRuleParser.cxx b/core/clingutils/src/RConversionRuleParser.cxx
index 40544bcc836..a4f55687c49 100644
--- a/core/clingutils/src/RConversionRuleParser.cxx
+++ b/core/clingutils/src/RConversionRuleParser.cxx
@@ -3,7 +3,7 @@
 
 #include "RConversionRuleParser.h"
 #include "TSchemaRuleProcessor.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 
 #include <iostream>
 #include <algorithm>
diff --git a/core/clingutils/src/RStl.cxx b/core/clingutils/src/RStl.cxx
index cdfe6a5b488..c974dd3de48 100644
--- a/core/clingutils/src/RStl.cxx
+++ b/core/clingutils/src/RStl.cxx
@@ -14,7 +14,7 @@
 
 #include "RStl.h"
 #include "TClassEdit.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 using namespace TClassEdit;
 
 #include <stdio.h>
diff --git a/core/clingutils/src/TClingUtils.cxx b/core/clingutils/src/TClingUtils.cxx
index 7939f6110d6..98930597fbf 100644
--- a/core/clingutils/src/TClingUtils.cxx
+++ b/core/clingutils/src/TClingUtils.cxx
@@ -56,7 +56,7 @@
 // Intentionally access non-public header ...
 #include "../../../interpreter/llvm/src/tools/clang/lib/Sema/HackForDefaultTemplateArg.h"
 
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 
 namespace ROOT {
 namespace TMetaUtils {
diff --git a/core/dictgen/res/BaseSelectionRule.h b/core/dictgen/res/BaseSelectionRule.h
index 4133b179fe4..a9645cbd168 100644
--- a/core/dictgen/res/BaseSelectionRule.h
+++ b/core/dictgen/res/BaseSelectionRule.h
@@ -27,8 +27,6 @@
 #include <list>
 #include <iosfwd>
 
-#include "TMetaUtils.h"
-
 namespace clang {
    class NamedDecl;
    class CXXRecordDecl;
diff --git a/core/dictgen/res/LinkdefReader.h b/core/dictgen/res/LinkdefReader.h
index 310bb18edb9..2fd8cf5f772 100644
--- a/core/dictgen/res/LinkdefReader.h
+++ b/core/dictgen/res/LinkdefReader.h
@@ -26,7 +26,7 @@
 #include <map>
 #include "llvm/ADT/StringRef.h"
 
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 
 namespace cling {
    class Interpreter;
diff --git a/core/dictgen/res/Scanner.h b/core/dictgen/res/Scanner.h
index 60e9f1e0570..a70cb5b474a 100644
--- a/core/dictgen/res/Scanner.h
+++ b/core/dictgen/res/Scanner.h
@@ -26,7 +26,7 @@
 
 #include "llvm/IR/Module.h"
 
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 
 namespace clang {
    class ClassTemplatePartialSpecializationDecl;
diff --git a/core/dictgen/res/SelectionRules.h b/core/dictgen/res/SelectionRules.h
index fb05c55d6a3..e021c055aec 100644
--- a/core/dictgen/res/SelectionRules.h
+++ b/core/dictgen/res/SelectionRules.h
@@ -18,7 +18,7 @@
 #include "VariableSelectionRule.h"
 #include "clang/AST/Decl.h"
 
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 
 namespace cling {
    class Interpreter;
diff --git a/core/dictgen/src/BaseSelectionRule.cxx b/core/dictgen/src/BaseSelectionRule.cxx
index f43b90021f3..c23e43fee14 100644
--- a/core/dictgen/src/BaseSelectionRule.cxx
+++ b/core/dictgen/src/BaseSelectionRule.cxx
@@ -20,6 +20,9 @@
 
 #include "BaseSelectionRule.h"
 
+#include "TClassEdit.h"
+#include "TClingUtils.h"
+
 #include <iostream>
 #include <string.h>
 #include <cctype>
diff --git a/core/dictgen/src/DictSelectionReader.cxx b/core/dictgen/src/DictSelectionReader.cxx
index 833411d3e78..7f2931500f1 100644
--- a/core/dictgen/src/DictSelectionReader.cxx
+++ b/core/dictgen/src/DictSelectionReader.cxx
@@ -4,7 +4,7 @@
 
 #include "ClassSelectionRule.h"
 #include "SelectionRules.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "TClassEdit.h"
 
 #include "RootMetaSelection.h"
diff --git a/core/dictgen/src/TModuleGenerator.cxx b/core/dictgen/src/TModuleGenerator.cxx
index c6588b14394..69ded95ebb4 100644
--- a/core/dictgen/src/TModuleGenerator.cxx
+++ b/core/dictgen/src/TModuleGenerator.cxx
@@ -18,7 +18,7 @@
 
 #include "TModuleGenerator.h"
 
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "RConfigure.h"
 #include "RConfig.h"
 
diff --git a/core/dictgen/src/XMLReader.cxx b/core/dictgen/src/XMLReader.cxx
index 587435d017d..1e4b35952eb 100644
--- a/core/dictgen/src/XMLReader.cxx
+++ b/core/dictgen/src/XMLReader.cxx
@@ -19,7 +19,7 @@
 
 #include "XMLReader.h"
 #include "SelectionRules.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 
 std::map<std::string, XMLReader::ETagNames> XMLReader::fgMapTagNames;
 
diff --git a/core/dictgen/src/rootcling_impl.cxx b/core/dictgen/src/rootcling_impl.cxx
index a7c78d6cb91..6f1d4388e8c 100644
--- a/core/dictgen/src/rootcling_impl.cxx
+++ b/core/dictgen/src/rootcling_impl.cxx
@@ -236,7 +236,7 @@ const char *rootClingHelp =
 #include "Rtypes.h"
 #include "TModuleGenerator.h"
 #include "TClassEdit.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "RStl.h"
 #include "XMLReader.h"
 #include "LinkdefReader.h"
diff --git a/core/metacling/src/TCling.cxx b/core/metacling/src/TCling.cxx
index 8bfa15dde82..d346cc00ff3 100644
--- a/core/metacling/src/TCling.cxx
+++ b/core/metacling/src/TCling.cxx
@@ -59,7 +59,7 @@ clang/LLVM technology.
 #include "RConversionRuleParser.h"
 #include "RConfigure.h"
 #include "compiledata.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "TVirtualCollectionProxy.h"
 #include "TVirtualStreamerInfo.h"
 #include "TListOfDataMembers.h"
diff --git a/core/metacling/src/TClingBaseClassInfo.cxx b/core/metacling/src/TClingBaseClassInfo.cxx
index d68bdb91d05..1bba7526563 100644
--- a/core/metacling/src/TClingBaseClassInfo.cxx
+++ b/core/metacling/src/TClingBaseClassInfo.cxx
@@ -24,7 +24,7 @@ the Clang C++ compiler, not CINT.
 
 #include "TClingClassInfo.h"
 #include "TDictionary.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 
 #include "TError.h"
 
diff --git a/core/metacling/src/TClingCallFunc.cxx b/core/metacling/src/TClingCallFunc.cxx
index 4d33426a9d4..f0c88f35345 100644
--- a/core/metacling/src/TClingCallFunc.cxx
+++ b/core/metacling/src/TClingCallFunc.cxx
@@ -27,7 +27,7 @@ C++ interpreter and the Clang C++ compiler, not CINT.
 #include "TClingClassInfo.h"
 #include "TClingMethodInfo.h"
 #include "TInterpreterValue.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "TSystem.h"
 
 #include "TError.h"
diff --git a/core/metacling/src/TClingCallbacks.cxx b/core/metacling/src/TClingCallbacks.cxx
index 85f39ddce4a..72b6779e5f2 100644
--- a/core/metacling/src/TClingCallbacks.cxx
+++ b/core/metacling/src/TClingCallbacks.cxx
@@ -30,7 +30,7 @@
 #include "clang/Lex/PPCallbacks.h"
 #include "llvm/Support/FileSystem.h"
 
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "ClingRAII.h"
 
 using namespace clang;
diff --git a/core/metacling/src/TClingClassInfo.cxx b/core/metacling/src/TClingClassInfo.cxx
index bd4c8dbdf76..839d9492473 100644
--- a/core/metacling/src/TClingClassInfo.cxx
+++ b/core/metacling/src/TClingClassInfo.cxx
@@ -28,7 +28,7 @@ but the class metadata comes from the Clang C++ compiler, not CINT.
 #include "TDictionary.h"
 #include "TClingTypeInfo.h"
 #include "TError.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "ThreadLocalStorage.h"
 
 #include "cling/Interpreter/Interpreter.h"
diff --git a/core/metacling/src/TClingDataMemberInfo.cxx b/core/metacling/src/TClingDataMemberInfo.cxx
index d2caaf9b560..dd1ab142c57 100644
--- a/core/metacling/src/TClingDataMemberInfo.cxx
+++ b/core/metacling/src/TClingDataMemberInfo.cxx
@@ -24,7 +24,7 @@ from the Clang C++ compiler, not CINT.
 
 #include "TDictionary.h"
 #include "TClingTypeInfo.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "TClassEdit.h"
 #include "TError.h"
 
diff --git a/core/metacling/src/TClingMethodInfo.cxx b/core/metacling/src/TClingMethodInfo.cxx
index ca967119c9f..28165bcf374 100644
--- a/core/metacling/src/TClingMethodInfo.cxx
+++ b/core/metacling/src/TClingMethodInfo.cxx
@@ -27,7 +27,7 @@ compiler, not CINT.
 #include "TDictionary.h"
 #include "TClingTypeInfo.h"
 #include "TError.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "TCling.h"
 #include "ThreadLocalStorage.h"
 
diff --git a/core/metacling/src/TClingTypeInfo.cxx b/core/metacling/src/TClingTypeInfo.cxx
index 2bc086fb32c..10e5cc58465 100644
--- a/core/metacling/src/TClingTypeInfo.cxx
+++ b/core/metacling/src/TClingTypeInfo.cxx
@@ -23,7 +23,7 @@ but the type metadata comes from the Clang C++ compiler, not CINT.
 #include "TDictionary.h"
 #include "Rtypes.h" // for gDebug
 #include "TClassEdit.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "TInterpreter.h"
 #include "ThreadLocalStorage.h"
 
diff --git a/core/metacling/src/TClingTypedefInfo.cxx b/core/metacling/src/TClingTypedefInfo.cxx
index 016b752279a..2497e823494 100644
--- a/core/metacling/src/TClingTypedefInfo.cxx
+++ b/core/metacling/src/TClingTypedefInfo.cxx
@@ -23,7 +23,7 @@ compiler, not CINT.
 
 #include "TDictionary.h"
 #include "TError.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include "Rtypes.h" // for gDebug
 #include "ThreadLocalStorage.h"
 
diff --git a/core/metacling/src/rootclingTCling.cxx b/core/metacling/src/rootclingTCling.cxx
index 039dc810b07..396a8b8948c 100644
--- a/core/metacling/src/rootclingTCling.cxx
+++ b/core/metacling/src/rootclingTCling.cxx
@@ -22,7 +22,7 @@
 #include "TROOT.h"
 #include "TStreamerInfo.h"
 #include "TClassEdit.h"
-#include "TMetaUtils.h"
+#include "TClingUtils.h"
 #include <memory>
 #include <iostream>
 #include <unordered_set>
-- 
GitLab