Rearrange standard C++ headers to be last (order from local to global)

cms-sw · Feb 25, 2020 · 1aa75ab · 1aa75ab
1 parent 223b585
commit 1aa75ab
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 25 deletions.
diff --git a/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h b/CondFormats/EcalObjects/interface/EcalCondObjectContainer.h
@@ -1,14 +1,14 @@
 #ifndef ECAL_COND_OBJECT_CONTAINER_HH
 #define ECAL_COND_OBJECT_CONTAINER_HH
 
-#include <vector>
-
 #include "CondFormats/Serialization/interface/Serializable.h"
 
 #include "DataFormats/EcalDetId/interface/EcalContainer.h"
 #include "DataFormats/EcalDetId/interface/EBDetId.h"
 #include "DataFormats/EcalDetId/interface/EEDetId.h"
 
+#include <vector>
+
 template <typename T>
 class EcalCondObjectContainer {
 public:

diff --git a/CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h b/CondFormats/EcalObjects/interface/EcalTPGCrystalStatus.h
@@ -10,6 +10,7 @@
 #include "CondFormats/EcalObjects/interface/EcalTPGCrystalStatusCode.h"
 
 #include "DataFormats/EcalDetId/interface/EcalContainer.h"
+
 #include <vector>
 
 typedef EcalCondObjectContainer<EcalTPGCrystalStatusCode> EcalTPGCrystalStatusMap;

diff --git a/CondFormats/HcalObjects/interface/HcalCondObjectContainer.h b/CondFormats/HcalObjects/interface/HcalCondObjectContainer.h
@@ -1,9 +1,6 @@
 #ifndef HcalCondObjectContainer_h
 #define HcalCondObjectContainer_h
 
-#include <vector>
-#include <string>
-
 #include "CondFormats/Serialization/interface/Serializable.h"
 #include "CondFormats/HcalObjects/interface/HcalDetIdRelationship.h"
 
@@ -13,6 +10,9 @@
 #include "DataFormats/HcalDetId/interface/HcalZDCDetId.h"
 #include "FWCore/Utilities/interface/Exception.h"
 
+#include <vector>
+#include <string>
+
 class HcalTopology;
 
 //#define HCAL_COND_SUPPRESS_DEFAULT

diff --git a/CondFormats/HcalObjects/interface/HcalIndexLookup.h b/CondFormats/HcalObjects/interface/HcalIndexLookup.h
@@ -1,17 +1,17 @@
 #ifndef CondFormats_HcalObjects_HcalIndexLookup_h
 #define CondFormats_HcalObjects_HcalIndexLookup_h
 
-#include <cstdint>
-#include <climits>
-#include <vector>
-
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "boost/serialization/access.hpp"
 #include "boost/serialization/version.hpp"
 #include "boost/serialization/vector.hpp"
 #include "boost/serialization/utility.hpp"
 
+#include <cstdint>
+#include <climits>
+#include <vector>
+
 //
 // Storable lookup of unsigned index values by unsigned key
 // (raw detId, ieta, etc)

diff --git a/CondFormats/HcalObjects/interface/HcalItemArrayColl.h b/CondFormats/HcalObjects/interface/HcalItemArrayColl.h
@@ -1,10 +1,6 @@
 #ifndef CondFormats_HcalObjects_HcalItemArrayColl_h
 #define CondFormats_HcalObjects_HcalItemArrayColl_h
 
-#include <memory>
-#include <array>
-#include <vector>
-
 #include "boost/array.hpp"
 #include "boost/serialization/access.hpp"
 #include "boost/serialization/version.hpp"
@@ -17,6 +13,10 @@
 #include "boost/serialization/boost_array.hpp"
 #endif
 
+#include <memory>
+#include <array>
+#include <vector>
+
 //
 // This collection manages arrays of pointers and references.
 // In particular, it can be used for storing objects in

diff --git a/CondFormats/HcalObjects/interface/HcalItemColl.h b/CondFormats/HcalObjects/interface/HcalItemColl.h
@@ -1,14 +1,14 @@
 #ifndef CondFormats_HcalObjects_HcalItemColl_h
 #define CondFormats_HcalObjects_HcalItemColl_h
 
-#include <memory>
-#include <vector>
-
 #include "boost/serialization/access.hpp"
 #include "boost/serialization/version.hpp"
 #include "boost/serialization/shared_ptr.hpp"
 #include "boost/serialization/vector.hpp"
 
+#include <memory>
+#include <vector>
+
 //
 // This collection manages only pointers and references.
 // In particular, it can be used for storing objects in

diff --git a/CondFormats/HcalObjects/interface/StorableDoubleMap.h b/CondFormats/HcalObjects/interface/StorableDoubleMap.h
@@ -1,13 +1,14 @@
 #ifndef CondFormats_HcalObjects_StorableDoubleMap_h
 #define CondFormats_HcalObjects_StorableDoubleMap_h
 
-#include <string>
-#include <memory>
-#include <map>
 #include "FWCore/Utilities/interface/Exception.h"
 
 #include "boost/serialization/map.hpp"
 
+#include <string>
+#include <memory>
+#include <map>
+
 template <typename T>
 class StorableDoubleMap {
 public:

diff --git a/CondFormats/SiPhase2TrackerObjects/interface/DTCELinkId.h b/CondFormats/SiPhase2TrackerObjects/interface/DTCELinkId.h
@@ -19,12 +19,12 @@ Description: DTCELinkId identifies a specific eLink in the interface of a specif
 //
 //
 
+#include "CondFormats/Serialization/interface/Serializable.h"
+
 #include <cstdint>
 #include <functional>
 #include <limits>
 
-#include "CondFormats/Serialization/interface/Serializable.h"
-
 class DTCELinkId {
 public:
   DTCELinkId() noexcept;

diff --git a/CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h b/CondFormats/SiPixelObjects/interface/SiPixelFedCablingTree.h
@@ -1,15 +1,15 @@
 #ifndef SiPixelFedCablingTree_H
 #define SiPixelFedCablingTree_H
 
+#include "CondFormats/SiPixelObjects/interface/CablingPathToDetUnit.h"
+#include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
+#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
+
 #include <vector>
 #include <unordered_map>
 #include <string>
 #include <map>
 
-#include "CondFormats/SiPixelObjects/interface/CablingPathToDetUnit.h"
-#include "CondFormats/SiPixelObjects/interface/SiPixelFedCabling.h"
-#include "CondFormats/SiPixelObjects/interface/PixelFEDCabling.h"
-
 class SiPixelFedCablingTree final : public SiPixelFedCabling {
 public:
   typedef sipixelobjects::PixelFEDCabling PixelFEDCabling;