Merge pull request #26617 from wddgit/clangFormatRestOfFWCore

Changes from scram build format-all on FWCore
cms-sw · May 9, 2019 · ce6799f · ce6799f
2 parents b22c5fb + 7121ba9
commit ce6799f
Show file tree

Hide file tree

Showing 560 changed files with 28,473 additions and 33,422 deletions.
diff --git a/FWCore/Catalog/interface/FileLocator.h b/FWCore/Catalog/interface/FileLocator.h
@@ -11,7 +11,6 @@
 namespace edm {
 
   class FileLocator {
-
   public:
     explicit FileLocator(std::string const& catUrl, bool fallback);
     ~FileLocator();
@@ -37,8 +36,7 @@ namespace edm {
 
     void init(std::string const& catUrl, bool fallback);
 
-    void parseRule(xercesc::DOMNode* ruleNode,
-                   ProtocolRules& rules);
+    void parseRule(xercesc::DOMNode* ruleNode, ProtocolRules& rules);
 
     std::string applyRules(ProtocolRules const& protocolRules,
                            std::string const& protocol,
@@ -53,11 +51,11 @@ namespace edm {
     /** Inverse rules are used to do the mapping from PFN to LFN*/
     ProtocolRules m_inverseRules;
 
-    std::string                 m_fileType;
-    std::string                 m_filename;
-    std::vector<std::string>    m_protocols;
-    std::string                 m_destination;
+    std::string m_fileType;
+    std::string m_filename;
+    std::vector<std::string> m_protocols;
+    std::string m_destination;
   };
-}
+}  // namespace edm
 
-#endif //  FWCore_Catalog_FileLocator_h
+#endif  //  FWCore_Catalog_FileLocator_h
diff --git a/FWCore/Catalog/interface/InputFileCatalog.h b/FWCore/Catalog/interface/InputFileCatalog.h
@@ -16,10 +16,12 @@ namespace edm {
   class FileCatalogItem {
   public:
     FileCatalogItem() : pfn_(), lfn_(), fallbackPfn_() {}
-    FileCatalogItem(std::string const& pfn, std::string const& lfn, std::string const& fallbackPfn) : pfn_(pfn), lfn_(lfn), fallbackPfn_(fallbackPfn) {}
-    std::string const& fileName() const {return pfn_;}
-    std::string const& logicalFileName() const {return lfn_;}
-    std::string const& fallbackFileName() const {return fallbackPfn_;}
+    FileCatalogItem(std::string const& pfn, std::string const& lfn, std::string const& fallbackPfn)
+        : pfn_(pfn), lfn_(lfn), fallbackPfn_(fallbackPfn) {}
+    std::string const& fileName() const { return pfn_; }
+    std::string const& logicalFileName() const { return lfn_; }
+    std::string const& fallbackFileName() const { return fallbackPfn_; }
+
   private:
     std::string pfn_;
     std::string lfn_;
@@ -28,21 +30,24 @@ namespace edm {
 
   class InputFileCatalog {
   public:
-    InputFileCatalog(std::vector<std::string> const& fileNames, std::string const& override, bool useLFNasPFNifLFNnotFound = false);
-    InputFileCatalog(std::vector<std::string> const& fileNames, std::string const& override, std::string const& overrideFallback, bool useLFNasPFNifLFNnotFound = false);
+    InputFileCatalog(std::vector<std::string> const& fileNames,
+                     std::string const& override,
+                     bool useLFNasPFNifLFNnotFound = false);
+    InputFileCatalog(std::vector<std::string> const& fileNames,
+                     std::string const& override,
+                     std::string const& overrideFallback,
+                     bool useLFNasPFNifLFNnotFound = false);
     ~InputFileCatalog();
-    std::vector<FileCatalogItem> const& fileCatalogItems() const {return fileCatalogItems_;}
-    std::vector<std::string> const& logicalFileNames() const {return logicalFileNames_;}
-    std::vector<std::string> const& fileNames() const {return fileNames_;}
-    std::vector<std::string> const& fallbackFileNames() const {return fallbackFileNames_;}
-    bool empty() const {return fileCatalogItems_.empty();}
-    static bool isPhysical(std::string const& name) {
-      return (name.empty() || name.find(':') != std::string::npos);
-    }
-
+    std::vector<FileCatalogItem> const& fileCatalogItems() const { return fileCatalogItems_; }
+    std::vector<std::string> const& logicalFileNames() const { return logicalFileNames_; }
+    std::vector<std::string> const& fileNames() const { return fileNames_; }
+    std::vector<std::string> const& fallbackFileNames() const { return fallbackFileNames_; }
+    bool empty() const { return fileCatalogItems_.empty(); }
+    static bool isPhysical(std::string const& name) { return (name.empty() || name.find(':') != std::string::npos); }
+
   private:
     void init(std::string const& override, std::string const& overrideFallback, bool useLFNasPFNifLFNnotFound);
-    void findFile(std::string & pfn, std::string & fallbackPfn, std::string const& lfn, bool useLFNasPFNifLFNnotFound);
+    void findFile(std::string& pfn, std::string& fallbackPfn, std::string const& lfn, bool useLFNasPFNifLFNnotFound);
     std::vector<std::string> logicalFileNames_;
     std::vector<std::string> fileNames_;
     std::vector<std::string> fallbackFileNames_;
@@ -52,6 +57,6 @@ namespace edm {
     edm::propagate_const<std::unique_ptr<FileLocator>> fallbackFileLocator_;
     edm::propagate_const<std::unique_ptr<FileLocator>> overrideFallbackFileLocator_;
   };
-}
+}  // namespace edm
 
 #endif
diff --git a/FWCore/Catalog/interface/SiteLocalConfig.h b/FWCore/Catalog/interface/SiteLocalConfig.h
@@ -2,18 +2,18 @@
 #define FWCore_Catalog_SiteLocalConfig_h
 
 // INCLUDES
-# include <set>
-# include <string>
-# include <vector>
-# include <netdb.h>
+#include <set>
+#include <string>
+#include <vector>
+#include <netdb.h>
 
 // PUBLIC DEFINES
 // PUBLIC CONSTANTS
 // PUBLIC TYPES
 namespace edm {
-    class ParameterSet;
-    class ActivityRegistry;
-}
+  class ParameterSet;
+  class ActivityRegistry;
+}  // namespace edm
 
 // PUBLIC VARIABLES
 // PUBLIC FUNCTIONS
@@ -22,13 +22,13 @@ namespace edm {
 namespace edm {
   class SiteLocalConfig {
   public:
-    SiteLocalConfig () {}
+    SiteLocalConfig() {}
     virtual ~SiteLocalConfig() {}
 
-    virtual std::string const dataCatalog (void) const = 0;
-    virtual std::string const fallbackDataCatalog (void) const = 0;
-    virtual std::string const lookupCalibConnect (std::string const& input) const = 0;
-    virtual std::string const rfioType (void) const = 0;
+    virtual std::string const dataCatalog(void) const = 0;
+    virtual std::string const fallbackDataCatalog(void) const = 0;
+    virtual std::string const lookupCalibConnect(std::string const& input) const = 0;
+    virtual std::string const rfioType(void) const = 0;
 
     virtual std::string const* sourceCacheTempDir() const = 0;
     virtual double const* sourceCacheMinFree() const = 0;
@@ -40,17 +40,17 @@ namespace edm {
     virtual bool enablePrefetching() const = 0;
     virtual unsigned int debugLevel() const = 0;
     virtual std::vector<std::string> const* sourceNativeProtocols() const = 0;
-    virtual struct addrinfo const * statisticsDestination() const = 0;
+    virtual struct addrinfo const* statisticsDestination() const = 0;
     virtual std::set<std::string> const* statisticsInfo() const = 0;
-    virtual std::string const& siteName (void) const = 0;
+    virtual std::string const& siteName(void) const = 0;
 
     // implicit copy constructor
     // implicit assignment operator
   private:
   };
-}
+}  // namespace edm
 
 // INLINE PUBLIC FUNCTIONS
 // INLINE MEMBER FUNCTIONS
 
-#endif //FWCore_Catalog_SiteLocalConfig_h
+#endif  //FWCore_Catalog_SiteLocalConfig_h