Merge pull request cms-sw#848 from gartung/fix-global-stream-cache

ktf · ktf · commit f87e32581b5a · 2013-09-18T07:30:09.000-07:00
Multithreaded framework -- Return pointer to streamCache type
diff --git a/FWCore/Framework/interface/global/implementors.h b/FWCore/Framework/interface/global/implementors.h
@@ -47,7 +47,7 @@ namespace edm {
           }
         }
       protected:
-        T * streamCache(edm::StreamID iID) const { return caches_[iID.value()]; }
+        C * streamCache(edm::StreamID iID) const { return caches_[iID.value()]; }
       private:
         virtual void preallocStreams(unsigned int iNStreams) override final {
           caches_.resize(iNStreams,static_cast<C*>(nullptr));

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ namespace edm {`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`	`protected:`
`50`		`- T * streamCache(edm::StreamID iID) const { return caches_[iID.value()]; }`
	`50`	`+ C * streamCache(edm::StreamID iID) const { return caches_[iID.value()]; }`
`51`	`51`	`private:`
`52`	`52`	`virtual void preallocStreams(unsigned int iNStreams) override final {`
`53`	`53`	`caches_.resize(iNStreams,static_cast<C*>(nullptr));`