From 01dfb9b13c77575bfa09bb97dfbb1453ee1c9cfc Mon Sep 17 00:00:00 2001
From: "Stephen A. Wood" <saw@jlab.org>
Date: Wed, 28 Nov 2018 11:53:54 -0500
Subject: [PATCH] Fix some compile warnings and link error with root 5.
---
src/THcDC.h | 2 +-
src/THcHelicityReader.h | 2 --
src/THcRun.cxx | 2 +-
src/THcRun.h | 2 +-
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/THcDC.h b/src/THcDC.h
index c4fe61a..80918fd 100644
--- a/src/THcDC.h
+++ b/src/THcDC.h
@@ -189,7 +189,7 @@ protected:
// double tan_angle, sin_angle, cos_angle;
// Intermediate structure for building
- static const char MAXTRACKS = 10;
+ static const UInt_t MAXTRACKS = 10;
std::vector<THcDriftChamberPlane*> fPlanes; // List of plane objects
std::vector<THcDriftChamber*> fChambers; // List of chamber objects
diff --git a/src/THcHelicityReader.h b/src/THcHelicityReader.h
index c594628..eef0150 100644
--- a/src/THcHelicityReader.h
+++ b/src/THcHelicityReader.h
@@ -21,8 +21,6 @@ public:
THcHelicityReader();
virtual ~THcHelicityReader();
- void Print();
-
struct ROCinfo {
Int_t roc; // ROC to read out
Int_t slot; // Headers to search for (0 = ignore)
diff --git a/src/THcRun.cxx b/src/THcRun.cxx
index 449a1f8..06f5593 100644
--- a/src/THcRun.cxx
+++ b/src/THcRun.cxx
@@ -40,7 +40,7 @@ THcRun::THcRun( const vector<TString>& pathList, const char* filename,
}
//_____________________________________________________________________________
-THcRun& THcRun::operator=(const THaRun& rhs)
+THcRun& THcRun::operator=(const THaRunBase& rhs)
{
// Assignment operator. Not really sure what I (saw) am doing here.
diff --git a/src/THcRun.h b/src/THcRun.h
index fa9eada..0fcd777 100644
--- a/src/THcRun.h
+++ b/src/THcRun.h
@@ -17,7 +17,7 @@ class THcRun : public THaRun {
THcRun( const THcRun& run );
THcRun( const std::vector<TString>& pathList, const char* filename,
const char* description="" );
- virtual THcRun& operator=( const THaRun& rhs );
+ THcRun& operator=( const THaRunBase& rhs );
virtual ~THcRun();
virtual void Print( Option_t* opt="" ) const;
THcParmList* GetHCParms() const { return fHcParms; }
--
GitLab