Merge pull request #5692 from davidlt/fix-clang-issues

Clang fixes related to Boost Serialization
cms-sw · Oct 6, 2014 · a863880 · a863880
2 parents 86db0fe + 83f701e
commit a863880
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h b/CalibFormats/SiPixelObjects/interface/PixelCalibConfiguration.h
@@ -174,7 +174,7 @@ namespace pos{
 
     virtual void writeASCII(std::string dir="") const;
     void 	 writeXML(        pos::PixelConfigKey key, int version, std::string path) const {;}
-    virtual void writeXMLHeader(  pos::PixelConfigKey key, 
+    virtual void writeXMLHeader(  pos::PixelConfigKey &key,
 				  int version, 
 				  std::string path, 
 				  std::ofstream *out,

diff --git a/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc b/CalibFormats/SiPixelObjects/src/PixelCalibConfiguration.cc
@@ -1673,7 +1673,7 @@ bool PixelCalibConfiguration::containsScan(std::string name) const
 }
 
 //=============================================================================================
-void PixelCalibConfiguration::writeXMLHeader(pos::PixelConfigKey key, 
+void PixelCalibConfiguration::writeXMLHeader(pos::PixelConfigKey &key,
                                     	     int version, 
                                     	     std::string path, 
                                     	     std::ofstream *outstream,

diff --git a/CondFormats/RPCObjects/interface/DBSpecToDetUnit.h b/CondFormats/RPCObjects/interface/DBSpecToDetUnit.h
@@ -2,7 +2,7 @@
 #define CondFormatsRPCObjectsDBSpecToDetUnit_H
 
 #include "DataFormats/DetId/interface/DetId.h"
-class ChamberLocationSpec;
+struct ChamberLocationSpec;
 class FebLocationSpec;
 
 class DBSpecToDetUnit {

diff --git a/CondFormats/RPCObjects/interface/DccSpec.h b/CondFormats/RPCObjects/interface/DccSpec.h
@@ -12,7 +12,7 @@
 #include <boost/cstdint.hpp>
 #include  "CondFormats/RPCObjects/interface/TriggerBoardSpec.h"
 
-class ChamberLocationSpec;
+struct ChamberLocationSpec;
 
 class DccSpec {
 public: