From 0e4d7124d4eb880017758f3553b5644a299e9cea Mon Sep 17 00:00:00 2001
From: prokscha <thomas.prokscha@psi.ch>
Date: Tue, 14 Nov 2017 14:39:15 +0100
Subject: [PATCH] Fixed errors and warnings on RHEL7.3, root6

---
 musrSimAna/Makefile   | 2 +-
 musrSimAna/musrTH.cxx | 2 +-
 musrSimAna/musrTH.hh  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/musrSimAna/Makefile b/musrSimAna/Makefile
index 1b4999b..7cebde2 100644
--- a/musrSimAna/Makefile
+++ b/musrSimAna/Makefile
@@ -5,7 +5,7 @@
 CPP=g++
 #CPPFLAGS= -I$(ROOTSYS)/include -I/userdisk/sedlak/myLCG/CondDBMySQL_new/CondDBMySQL/include -I/usr/include/mysql
 #LDFLAGS= $(shell root-config --glibs) -L/userdisk/sedlak/myLCG/CondDBMySQL_new/CondDBMySQL/src/.libs -lconddb -L/usr/lib/mysql -lmysqlclient
-CPPFLAGS= -I$(ROOTSYS)/include
+CPPFLAGS= -I$(ROOTSYS)/include/root -std=c++11
 LDFLAGS= $(shell root-config --glibs) -lMinuit
 
 all:	musrRoot
diff --git a/musrSimAna/musrTH.cxx b/musrSimAna/musrTH.cxx
index ce0410d..906523f 100644
--- a/musrSimAna/musrTH.cxx
+++ b/musrSimAna/musrTH.cxx
@@ -2,7 +2,7 @@
 #include "musrAnalysis.hh"
 #include "TCanvas.h"
 
-musrTH::musrTH(char* dimension, char* histoName, char* histoTitle, Int_t nrOfBinsX, Double_t minBoundaryX, Double_t maxBoundaryX, Int_t nrOfBinsY, Double_t minBoundaryY, Double_t maxBoundaryY, Double_t* variableName1, Double_t* variableName2) {
+musrTH::musrTH(const char* dimension, const char* histoName, const char* histoTitle, Int_t nrOfBinsX, Double_t minBoundaryX, Double_t maxBoundaryX, Int_t nrOfBinsY, Double_t minBoundaryY, Double_t maxBoundaryY, Double_t* variableName1, Double_t* variableName2) {
 //musrTH::musrTH(char* dimension, char* histoName, char* histoTitle, Int_t nrOfBins, Double_t minBoundary, Double_t maxBoundary, Double_t* variableName1, Double_t* varibleName2) {
   std::cout<<" Defining "<<dimension<<" histogram "<<histoName<<" \""<<histoTitle<<"\" "
            <<nrOfBinsX<<" "<<minBoundaryX<<" "<<maxBoundaryX<<" "
diff --git a/musrSimAna/musrTH.hh b/musrSimAna/musrTH.hh
index 00b8dcd..e624b52 100644
--- a/musrSimAna/musrTH.hh
+++ b/musrSimAna/musrTH.hh
@@ -17,7 +17,7 @@ public:
   typedef std::map<Int_t,std::string> humanDecayMapType;
   typedef std::multimap<Int_t,Int_t> humanDecayMultimapType;
 
-  musrTH(char* dimension, char* histoName, char* histoTitle, Int_t nrOfBinsX, Double_t minBoundaryX, Double_t maxBoundaryX, Int_t nrOfBinsX, Double_t minBoundaryY, Double_t maxBoundaryY, Double_t* variableName1, Double_t* variableName2);
+  musrTH(const char* dimension, const char* histoName, const char* histoTitle, Int_t nrOfBinsX, Double_t minBoundaryX, Double_t maxBoundaryX, Int_t nrOfBinsY, Double_t minBoundaryY, Double_t maxBoundaryY, Double_t* variableName1, Double_t* variableName2);
   ~musrTH();
   void FillTH1D(Double_t vaha, Bool_t* cond);
   void FillTH2D(Double_t vaha, Bool_t* cond);