Merge pull request #16769 from Dr15Jones/fixClangWarnings

Fixed clang warning
cms-sw · Nov 27, 2016 · 2e8dc87 · 2e8dc87
2 parents e4355d4 + 35aff2b
commit 2e8dc87
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 18 deletions.
diff --git a/FWCore/Framework/src/ESProxyFactoryProducer.cc b/FWCore/Framework/src/ESProxyFactoryProducer.cc
@@ -45,7 +45,7 @@ ESProxyFactoryProducer::ESProxyFactoryProducer() : record2Factories_()
 //    // do actual copying here;
 // }
 
-ESProxyFactoryProducer::~ESProxyFactoryProducer()
+ESProxyFactoryProducer::~ESProxyFactoryProducer() noexcept(false)
 {
 }
 

diff --git a/FWCore/Framework/src/OutputModuleCommunicatorT.cc b/FWCore/Framework/src/OutputModuleCommunicatorT.cc
@@ -101,7 +101,7 @@ namespace edm {
 
   namespace impl {
     std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(void *) {
-      return std::move(std::unique_ptr<edm::OutputModuleCommunicator>{});
+      return std::unique_ptr<edm::OutputModuleCommunicator>{};
     }
     std::unique_ptr<edm::OutputModuleCommunicator> createCommunicatorIfNeeded(::edm::OutputModule * iMod){
       return std::make_unique<OutputModuleCommunicatorT<edm::OutputModule>>(iMod);

diff --git a/FWCore/Framework/src/ProductResolvers.h b/FWCore/Framework/src/ProductResolvers.h
@@ -161,7 +161,7 @@ namespace edm {
                                  ModuleCallingContext const* mcc) const override;
     virtual bool unscheduledWasNotRun_() const override {return false;}
 
-    virtual void putProduct_(std::unique_ptr<WrapperBase> edp) const;
+    virtual void putProduct_(std::unique_ptr<WrapperBase> edp) const override;
     virtual void resetProductData_(bool deleteEarly) override;
 
     mutable WaitingTaskList m_waitingTasks;
@@ -266,7 +266,7 @@ namespace edm {
                                  Principal const& principal,
                                  bool skipCurrentProcess,
                                  SharedResourcesAcquirer* sra,
-                                 ModuleCallingContext const* mcc) const {
+                                 ModuleCallingContext const* mcc) const override {
       realProduct_->prefetchAsync( waitTask, principal, skipCurrentProcess, sra, mcc);
     }
     virtual bool unscheduledWasNotRun_() const override {return realProduct_->unscheduledWasNotRun();}

diff --git a/FWCore/Services/plugins/CPU.cc b/FWCore/Services/plugins/CPU.cc
@@ -82,10 +82,6 @@ namespace edm {
 	return atof(s.c_str());
       }
 
-      inline int str2i(std::string s){
-	return atoi(s.c_str());
-      }
-
       void trim(std::string& s, const std::string& drop = " \t") {
         std::string::size_type p = s.find_last_not_of(drop);
         if(p != std::string::npos) {

diff --git a/IOPool/Common/interface/getWrapperBasePtr.h b/IOPool/Common/interface/getWrapperBasePtr.h
@@ -2,12 +2,12 @@
 #define IOPool_Common_getWrapperBasePtr_h
 
 #include "DataFormats/Common/interface/WrapperBase.h"
-#include "FWCore/Utilities//interface/getAnyPtr.h"
+#include "FWCore/Utilities/interface/getAnyPtr.h"
 
 namespace edm {
   inline
   std::unique_ptr<WrapperBase> getWrapperBasePtr(void* p, int offset) {
-    return(std::move(getAnyPtr<WrapperBase>(p, offset)));
+    return getAnyPtr<WrapperBase>(p, offset);
   }
 }
 

diff --git a/IOPool/Input/src/EmbeddedRootSource.h b/IOPool/Input/src/EmbeddedRootSource.h
@@ -53,8 +53,8 @@ namespace edm {
     virtual void beginJob() override;
     virtual void endJob() override;
     virtual bool readOneEvent(EventPrincipal& cache, size_t& fileNameHash, CLHEP::HepRandomEngine*, EventID const* id) override;
-    virtual void readOneSpecified(EventPrincipal& cache, size_t& fileNameHash, SecondaryEventIDAndFileInfo const& id);
-    virtual void dropUnwantedBranches_(std::vector<std::string> const& wantedBranches);
+    virtual void readOneSpecified(EventPrincipal& cache, size_t& fileNameHash, SecondaryEventIDAndFileInfo const& id) override;
+    virtual void dropUnwantedBranches_(std::vector<std::string> const& wantedBranches) override;
 
     RootServiceChecker rootServiceChecker_;
 

diff --git a/IOPool/Input/src/PoolSource.cc b/IOPool/Input/src/PoolSource.cc
@@ -160,7 +160,7 @@ namespace edm {
     if(secondaryFileSequence_) {
       fb->setNotFastClonable(FileBlock::HasSecondaryFileSequence);
     }
-    return std::move(fb);
+    return fb;
   }
 
   void PoolSource::closeFile_() {

diff --git a/IOPool/Input/src/RootFile.h b/IOPool/Input/src/RootFile.h
@@ -39,7 +39,7 @@ namespace edm {
   class BranchID;
   class BranchIDListHelper;
   class ProductProvenanceRetriever;
-  class DaqProvenanceHelper;
+  struct DaqProvenanceHelper;
   class DuplicateChecker;
   class EventSkipperByID;
   class ProcessHistoryRegistry;

diff --git a/IOPool/Output/interface/TimeoutPoolOutputModule.h b/IOPool/Output/interface/TimeoutPoolOutputModule.h
@@ -26,7 +26,7 @@ namespace edm {
     TimeoutPoolOutputModule(TimeoutPoolOutputModule const&) = delete; // Disallow copying and moving
     TimeoutPoolOutputModule& operator=(TimeoutPoolOutputModule const&) = delete; // Disallow copying and moving
   protected:
-    virtual bool shouldWeCloseFile() const;
+    virtual bool shouldWeCloseFile() const override;
     virtual void write(EventForOutput const& e) override;
 
   private:

diff --git a/IOPool/Streamer/src/StreamerFileReader.h b/IOPool/Streamer/src/StreamerFileReader.h
@@ -29,10 +29,10 @@ namespace edm {
     static void fillDescriptions(ConfigurationDescriptions& descriptions);
 
   private:
-    virtual bool checkNextEvent();
-    virtual void skip(int toSkip);
+    virtual bool checkNextEvent() override;
+    virtual void skip(int toSkip) override;
     virtual void genuineCloseFile() override;
-    virtual void reset_();
+    virtual void reset_() override;
 
     std::shared_ptr<EventSkipperByID const> eventSkipperByID() const {return get_underlying_safe(eventSkipperByID_);}
     std::shared_ptr<EventSkipperByID>& eventSkipperByID() {return get_underlying_safe(eventSkipperByID_);}