Commit af1626e
committed
Cherry pick RTS/src/DAQ_TPX/tpxGain.h from 6dd0b8e
In order to resolve the error:
```
g++ -m64 -fPIC -pipe -Wall -Woverloaded-virtual -std=c++0x -Wno-long-long -pthread -Wno-deprecated-declarations -O2 -g -falign-loops -falign-jumps -falign-functions -Dsl79_gcc485 -D__ROOT__ -DNEW_DAQ_READER -I. -IStRoot/StTpcHitMaker -IStRoot/RTS/src -IStRoot/RTS/include -IStRoot/RTS/trg/include -I. -IStRoot -I.sl79_gcc485/include -I/opt/software/linux-scientific7-x86_64/gcc-4.8.5/root-5.34.38-l3v6vso6qgojm4l2ctwjojs6trbt4hpn/include -c .sl79_gcc485/OBJ/StRoot/StTpcHitMaker/StTpcRTSHitMaker.cxx -o .sl79_gcc485/OBJ/StRoot/StTpcHitMaker/StTpcRTSHitMaker.o
.sl79_gcc485/OBJ/StRoot/StTpcHitMaker/StTpcRTSHitMaker.cxx: In member function 'virtual Int_t StTpcRTSHitMaker::InitRun(Int_t)':
.sl79_gcc485/OBJ/StRoot/StTpcHitMaker/StTpcRTSHitMaker.cxx:216:33: error: invalid conversion from 'const Char_t* {aka const char*}' to 'char*' [-fpermissive]
if (gain->from_file(fname, 0) < 0) {
^
In file included from .sl79_gcc485/OBJ/StRoot/StTpcHitMaker/StTpcRTSHitMaker.cxx:49:0:
StRoot/RTS/src/DAQ_TPX/tpxGain.h:142:6: error: initializing argument 1 of 'int tpxGain::from_file(char*, int)' [-fpermissive]
int from_file(char *fname, int sector = 0) ;
^
.sl79_gcc485/OBJ/StRoot/StTpcHitMaker/StTpcRTSHitMaker.cxx:150:19: warning: unused variable 'fnameITPC' [-Wunused-variable]
const Char_t *fnameITPC = "none";
^
cons: *** [.sl79_gcc485/OBJ/StRoot/StTpcHitMaker/StTpcRTSHitMaker.o] Error 1
cons: errors constructing .sl79_gcc485/OBJ/StRoot/StTpcHitMaker/StTpcRTSHitMaker.o
```1 parent e8448c3 commit af1626e
2 files changed
Lines changed: 4 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
828 | 828 | | |
829 | 829 | | |
830 | 830 | | |
831 | | - | |
| 831 | + | |
832 | 832 | | |
833 | 833 | | |
834 | 834 | | |
| |||
999 | 999 | | |
1000 | 1000 | | |
1001 | 1001 | | |
1002 | | - | |
| 1002 | + | |
1003 | 1003 | | |
1004 | 1004 | | |
1005 | 1005 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
139 | 139 | | |
140 | 140 | | |
141 | 141 | | |
142 | | - | |
| 142 | + | |
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
| |||
193 | 193 | | |
194 | 194 | | |
195 | 195 | | |
196 | | - | |
| 196 | + | |
197 | 197 | | |
198 | 198 | | |
199 | 199 | | |
| |||
0 commit comments