From c13ed23a2c25743d4b8286ff49ac2bcd94c8bf97 Mon Sep 17 00:00:00 2001
From: Christopher Jones <chrisdjones15@gmail.com>
Date: Thu, 10 Sep 2020 12:59:55 -0500
Subject: [PATCH] Moved ParameterSet headers to src if not needed for API

---
 FWCore/ParameterSet/src/ANDGroupDescription.cc              | 2 +-
 .../ParameterSet/{interface => src}/ANDGroupDescription.h   | 0
 FWCore/ParameterSet/src/FillDescriptionFromPSet.cc          | 2 +-
 .../{interface => src}/FillDescriptionFromPSet.h            | 0
 FWCore/ParameterSet/src/ORGroupDescription.cc               | 2 +-
 FWCore/ParameterSet/{interface => src}/ORGroupDescription.h | 0
 FWCore/ParameterSet/src/ParameterDescription.cc             | 2 +-
 FWCore/ParameterSet/src/ParameterDescriptionNode.cc         | 6 +++---
 FWCore/ParameterSet/src/ParameterSet.cc                     | 2 +-
 FWCore/ParameterSet/src/ParameterSetConverter.cc            | 2 +-
 FWCore/ParameterSet/src/VParameterSetEntry.cc               | 2 +-
 FWCore/ParameterSet/src/XORGroupDescription.cc              | 2 +-
 .../ParameterSet/{interface => src}/XORGroupDescription.h   | 0
 FWCore/ParameterSet/{interface => src}/split.h              | 0
 FWCore/ParameterSet/src/types.cc                            | 2 +-
 15 files changed, 12 insertions(+), 12 deletions(-)
 rename FWCore/ParameterSet/{interface => src}/ANDGroupDescription.h (100%)
 rename FWCore/ParameterSet/{interface => src}/FillDescriptionFromPSet.h (100%)
 rename FWCore/ParameterSet/{interface => src}/ORGroupDescription.h (100%)
 rename FWCore/ParameterSet/{interface => src}/XORGroupDescription.h (100%)
 rename FWCore/ParameterSet/{interface => src}/split.h (100%)

diff --git a/FWCore/ParameterSet/src/ANDGroupDescription.cc b/FWCore/ParameterSet/src/ANDGroupDescription.cc
index fb27d84d93518..a8f7c9ff313f2 100644
--- a/FWCore/ParameterSet/src/ANDGroupDescription.cc
+++ b/FWCore/ParameterSet/src/ANDGroupDescription.cc
@@ -1,5 +1,5 @@
 
-#include "FWCore/ParameterSet/interface/ANDGroupDescription.h"
+#include "FWCore/ParameterSet/src/ANDGroupDescription.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 
diff --git a/FWCore/ParameterSet/interface/ANDGroupDescription.h b/FWCore/ParameterSet/src/ANDGroupDescription.h
similarity index 100%
rename from FWCore/ParameterSet/interface/ANDGroupDescription.h
rename to FWCore/ParameterSet/src/ANDGroupDescription.h
diff --git a/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc b/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc
index e359aef0893a8..f31c34e56632a 100644
--- a/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc
+++ b/FWCore/ParameterSet/src/FillDescriptionFromPSet.cc
@@ -1,5 +1,5 @@
 
-#include "FWCore/ParameterSet/interface/FillDescriptionFromPSet.h"
+#include "FWCore/ParameterSet/src/FillDescriptionFromPSet.h"
 #include "FWCore/ParameterSet/interface/ParameterDescriptionNode.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
diff --git a/FWCore/ParameterSet/interface/FillDescriptionFromPSet.h b/FWCore/ParameterSet/src/FillDescriptionFromPSet.h
similarity index 100%
rename from FWCore/ParameterSet/interface/FillDescriptionFromPSet.h
rename to FWCore/ParameterSet/src/FillDescriptionFromPSet.h
diff --git a/FWCore/ParameterSet/src/ORGroupDescription.cc b/FWCore/ParameterSet/src/ORGroupDescription.cc
index f394780600d10..64f5d8e4f3cf8 100644
--- a/FWCore/ParameterSet/src/ORGroupDescription.cc
+++ b/FWCore/ParameterSet/src/ORGroupDescription.cc
@@ -1,5 +1,5 @@
 
-#include "FWCore/ParameterSet/interface/ORGroupDescription.h"
+#include "FWCore/ParameterSet/src/ORGroupDescription.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 
diff --git a/FWCore/ParameterSet/interface/ORGroupDescription.h b/FWCore/ParameterSet/src/ORGroupDescription.h
similarity index 100%
rename from FWCore/ParameterSet/interface/ORGroupDescription.h
rename to FWCore/ParameterSet/src/ORGroupDescription.h
diff --git a/FWCore/ParameterSet/src/ParameterDescription.cc b/FWCore/ParameterSet/src/ParameterDescription.cc
index 7bda236813c23..efdca7d9aa044 100644
--- a/FWCore/ParameterSet/src/ParameterDescription.cc
+++ b/FWCore/ParameterSet/src/ParameterDescription.cc
@@ -7,7 +7,7 @@
 #include "DataFormats/Provenance/interface/LuminosityBlockRange.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 #include "FWCore/ParameterSet/interface/FileInPath.h"
-#include "FWCore/ParameterSet/interface/FillDescriptionFromPSet.h"
+#include "FWCore/ParameterSet/src/FillDescriptionFromPSet.h"
 #include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
 #include "FWCore/ParameterSet/interface/VParameterSetEntry.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
diff --git a/FWCore/ParameterSet/src/ParameterDescriptionNode.cc b/FWCore/ParameterSet/src/ParameterDescriptionNode.cc
index 1fa1a6bf2edf1..06821aa0a25c8 100644
--- a/FWCore/ParameterSet/src/ParameterDescriptionNode.cc
+++ b/FWCore/ParameterSet/src/ParameterDescriptionNode.cc
@@ -1,9 +1,9 @@
 
 #include "FWCore/ParameterSet/interface/ParameterDescriptionNode.h"
 #include "FWCore/ParameterSet/interface/ParameterDescriptionCases.h"
-#include "FWCore/ParameterSet/interface/ANDGroupDescription.h"
-#include "FWCore/ParameterSet/interface/ORGroupDescription.h"
-#include "FWCore/ParameterSet/interface/XORGroupDescription.h"
+#include "FWCore/ParameterSet/src/ANDGroupDescription.h"
+#include "FWCore/ParameterSet/src/ORGroupDescription.h"
+#include "FWCore/ParameterSet/src/XORGroupDescription.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 
 #include <vector>
diff --git a/FWCore/ParameterSet/src/ParameterSet.cc b/FWCore/ParameterSet/src/ParameterSet.cc
index edcb60dfca8aa..d22f363866c40 100644
--- a/FWCore/ParameterSet/src/ParameterSet.cc
+++ b/FWCore/ParameterSet/src/ParameterSet.cc
@@ -11,7 +11,7 @@
 
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/Registry.h"
-#include "FWCore/ParameterSet/interface/split.h"
+#include "FWCore/ParameterSet/src/split.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 #include "FWCore/Utilities/interface/Digest.h"
 #include "FWCore/Utilities/interface/EDMException.h"
diff --git a/FWCore/ParameterSet/src/ParameterSetConverter.cc b/FWCore/ParameterSet/src/ParameterSetConverter.cc
index 5b23740ab53da..be0ed675ac1d1 100644
--- a/FWCore/ParameterSet/src/ParameterSetConverter.cc
+++ b/FWCore/ParameterSet/src/ParameterSetConverter.cc
@@ -10,7 +10,7 @@ ParameterSetConverter.cc
 #include "FWCore/ParameterSet/interface/ParameterSetConverter.h"
 #include <iterator>
 #include "FWCore/ParameterSet/interface/Registry.h"
-#include "FWCore/ParameterSet/interface/split.h"
+#include "FWCore/ParameterSet/src/split.h"
 #include "FWCore/Utilities/interface/Algorithms.h"
 
 namespace edm {
diff --git a/FWCore/ParameterSet/src/VParameterSetEntry.cc b/FWCore/ParameterSet/src/VParameterSetEntry.cc
index cb9fff8537642..79fdc007cbcaf 100644
--- a/FWCore/ParameterSet/src/VParameterSetEntry.cc
+++ b/FWCore/ParameterSet/src/VParameterSetEntry.cc
@@ -1,6 +1,6 @@
 #include "FWCore/ParameterSet/interface/VParameterSetEntry.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ParameterSet/interface/split.h"
+#include "FWCore/ParameterSet/src/split.h"
 #include "FWCore/Utilities/interface/Digest.h"
 
 #include <cassert>
diff --git a/FWCore/ParameterSet/src/XORGroupDescription.cc b/FWCore/ParameterSet/src/XORGroupDescription.cc
index 9e278e3f49329..76b915c0e12b6 100644
--- a/FWCore/ParameterSet/src/XORGroupDescription.cc
+++ b/FWCore/ParameterSet/src/XORGroupDescription.cc
@@ -1,5 +1,5 @@
 
-#include "FWCore/ParameterSet/interface/XORGroupDescription.h"
+#include "FWCore/ParameterSet/src/XORGroupDescription.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/ParameterSet/interface/DocFormatHelper.h"
 
diff --git a/FWCore/ParameterSet/interface/XORGroupDescription.h b/FWCore/ParameterSet/src/XORGroupDescription.h
similarity index 100%
rename from FWCore/ParameterSet/interface/XORGroupDescription.h
rename to FWCore/ParameterSet/src/XORGroupDescription.h
diff --git a/FWCore/ParameterSet/interface/split.h b/FWCore/ParameterSet/src/split.h
similarity index 100%
rename from FWCore/ParameterSet/interface/split.h
rename to FWCore/ParameterSet/src/split.h
diff --git a/FWCore/ParameterSet/src/types.cc b/FWCore/ParameterSet/src/types.cc
index 57121cda9ad32..d5b81cf890cec 100644
--- a/FWCore/ParameterSet/src/types.cc
+++ b/FWCore/ParameterSet/src/types.cc
@@ -9,7 +9,7 @@
 #include "FWCore/ParameterSet/interface/types.h"
 
 #include "boost/lexical_cast.hpp"
-#include "FWCore/ParameterSet/interface/split.h"
+#include "FWCore/ParameterSet/src/split.h"
 #include "FWCore/Utilities/interface/Parse.h"
 #include <cctype>
 #include <cstdlib>