Applied clang-tidy to FWCore

cms-sw · Aug 29, 2017 · b2d65ab · b2d65ab
1 parent 60ea8c8
commit b2d65ab
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/FWCore/Framework/interface/ESHandle.h b/FWCore/Framework/interface/ESHandle.h
@@ -44,7 +44,7 @@ class ESHandleBase {
 
       edm::eventsetup::ComponentDescription const* description() const;
 
-      bool isValid() const { return 0 != data_ && 0 != description_; }
+      bool isValid() const { return nullptr != data_ && nullptr != description_; }
 
       bool failedToGet() const { return bool(whyFailedFactory_); }
 

diff --git a/FWCore/Framework/interface/NoRecordException.h b/FWCore/Framework/interface/NoRecordException.h
@@ -55,7 +55,7 @@ class NoRecordException : public cms::Exception
     no_record_exception_message_builder(*this,heterocontainer::className<T>(), iValue, iKnownRecord);
   }
 
-      virtual ~NoRecordException() throw() {}
+      ~NoRecordException() throw() override {}
 
       // ---------- const member functions ---------------------
 

diff --git a/FWCore/Utilities/interface/EDMException.h b/FWCore/Utilities/interface/EDMException.h
@@ -82,7 +82,7 @@ namespace edm {
 
     Exception(Exception const& other);
 
-    virtual ~Exception() throw();
+    ~Exception() throw() override;
 
     void swap(Exception& other) {
       std::swap(category_, other.category_);
@@ -102,12 +102,12 @@ namespace edm {
                           char const* message4 = "");
     static void throwThis(Code category, char const* message0, int intVal, char const* message2 = "");
 
-    virtual Exception* clone() const;
+    Exception* clone() const override;
 
   private:
 
-    virtual void rethrow();
-    virtual int returnCode_() const;
+    void rethrow() override;
+    int returnCode_() const override;
 
     Code category_;
   };

diff --git a/FWCore/Utilities/interface/Exception.h b/FWCore/Utilities/interface/Exception.h
@@ -84,14 +84,14 @@ namespace cms {
               Exception const& another);
 
     Exception(Exception const& other); 
-    virtual ~Exception() throw();
+    ~Exception() throw() override;
 
     void swap(Exception& other);
 
     Exception& operator=(Exception const& other);
 
     // The signature for what() must be identical to that of std::exception::what().
-    virtual char const* what() const throw();
+    char const* what() const throw() override;
 
     virtual std::string explainSelf() const;
 

diff --git a/FWCore/Utilities/interface/TypeIDBase.h b/FWCore/Utilities/interface/TypeIDBase.h
@@ -41,7 +41,7 @@ namespace edm {
       { }
 
       explicit TypeIDBase(const std::type_info* t) :
-         t_(t == 0 ? &(typeid(Def)) : t)
+         t_(t == nullptr ? &(typeid(Def)) : t)
       { }
 
       // ---------- const member functions ---------------------