Skip to content

Commit ac36d87

Browse files
pcanalpcanal
committed
Fix coverity warnings
git-svn-id: http://root.cern.ch/svn/root/trunk@49054 27541ba8-7e3a-0410-8455-c3a389f83636
1 parent fdf6ec7 commit ac36d87

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

‎io/io/src/TGenCollectionStreamer.cxx‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ void DispatchConvertArray(int writeType, TGenCollectionProxy::StreamHelper *read
185185
case kDouble_t:
186186
ConvertArray<From,Double_t>(read,write,nElements);
187187
break;
188-
case TGenCollectionProxy::kBOOL_t:
188+
case EDataType(TGenCollectionProxy::kBOOL_t):
189189
ConvertArray<From,bool>(read,write,nElements);
190190
break;
191191
case kUChar_t:
@@ -280,7 +280,7 @@ void TGenCollectionStreamer::ReadPrimitives(int nElements, TBuffer &b, const TCl
280280
case kDouble_t:
281281
b.ReadFastArray(&itmread->dbl , nElements);
282282
break;
283-
case kBOOL_t:
283+
case EDataType(kBOOL_t):
284284
b.ReadFastArray(&itmread->boolean , nElements);
285285
break;
286286
case kUChar_t:
@@ -335,7 +335,7 @@ void TGenCollectionStreamer::ReadPrimitives(int nElements, TBuffer &b, const TCl
335335
case kDouble_t:
336336
DispatchConvertArray<Double_t>(fVal->fKind, itmread, itmstore, nElements);
337337
break;
338-
case kBOOL_t:
338+
case EDataType(kBOOL_t):
339339
DispatchConvertArray<bool>(fVal->fKind, itmread, itmstore, nElements);
340340
break;
341341
case kUChar_t:
@@ -399,13 +399,13 @@ void TGenCollectionStreamer::ReadObjects(int nElements, TBuffer &b, const TClass
399399
switch (fVal->fCase) {
400400
case kIsClass:
401401
DOLOOP(b.StreamObject(i, fVal->fType, onFileValClass ));
402-
case kBIT_ISSTRING:
402+
case EProperty(kBIT_ISSTRING):
403403
DOLOOP(i->read_std_string(b));
404-
case kIsPointer | kIsClass:
404+
case EProperty(kIsPointer | kIsClass):
405405
DOLOOP(i->set(b.ReadObjectAny(fVal->fType)));
406-
case kIsPointer | kBIT_ISSTRING:
406+
case EProperty(kIsPointer | kBIT_ISSTRING):
407407
DOLOOP(i->read_std_string_pointer(b));
408-
case kIsPointer | kBIT_ISTSTRING | kIsClass:
408+
case EProperty(kIsPointer | kBIT_ISTSTRING | kIsClass):
409409
DOLOOP(i->read_tstring_pointer(vsn3, b));
410410
}
411411
#undef DOLOOP
@@ -447,20 +447,20 @@ void TGenCollectionStreamer::ReadObjects(int nElements, TBuffer &b, const TClass
447447
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
448448
fDestruct(fEnv->fStart,fEnv->fSize);
449449
break;
450-
case kBIT_ISSTRING:
450+
case EProperty(kBIT_ISSTRING):
451451
DOLOOP(i->read_std_string(b))
452452
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
453453
fDestruct(fEnv->fStart,fEnv->fSize);
454454
break;
455-
case kIsPointer | kIsClass:
455+
case EProperty(kIsPointer | kIsClass):
456456
DOLOOP(i->set(b.ReadObjectAny(fVal->fType)));
457457
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
458458
break;
459-
case kIsPointer | kBIT_ISSTRING:
459+
case EProperty(kIsPointer | kBIT_ISSTRING):
460460
DOLOOP(i->read_std_string_pointer(b))
461461
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
462462
break;
463-
case kIsPointer | kBIT_ISTSTRING | kIsClass:
463+
case EProperty(kIsPointer | kBIT_ISTSTRING | kIsClass):
464464
DOLOOP(i->read_tstring_pointer(vsn3, b));
465465
fFeed(fEnv->fStart,fEnv->fObject,fEnv->fSize);
466466
break;
@@ -608,7 +608,7 @@ void TGenCollectionStreamer::ReadMapHelper(StreamHelper *i, Value *v, Bool_t vsn
608608
case kDouble_t:
609609
b >> i->dbl;
610610
break;
611-
case kBOOL_t:
611+
case EDataType(kBOOL_t):
612612
b >> i->boolean;
613613
break;
614614
case kUChar_t:
@@ -695,7 +695,7 @@ To readOneValue(TBuffer &b, int readtype) {
695695
b >> i->dbl;
696696
return (To)i->dbl;
697697
break;
698-
case TGenCollectionProxy::kBOOL_t:
698+
case EDataType(TGenCollectionProxy::kBOOL_t):
699699
b >> i->boolean;
700700
return (To)i->boolean;
701701
break;
@@ -795,7 +795,7 @@ void TGenCollectionStreamer::ReadMap(int nElements, TBuffer &b, const TClass *on
795795
case kDouble_t:
796796
i->dbl = readOneValue<Double_t>(b,readtype);
797797
break;
798-
case kBOOL_t:
798+
case EDataType(kBOOL_t):
799799
i->boolean = readOneValue<bool>(b,readtype);
800800
break;
801801
case kUChar_t:
@@ -851,7 +851,7 @@ void TGenCollectionStreamer::ReadMap(int nElements, TBuffer &b, const TClass *on
851851
case kDouble_t:
852852
b >> i->dbl;
853853
break;
854-
case kBOOL_t:
854+
case EDataType(kBOOL_t):
855855
b >> i->boolean;
856856
break;
857857
case kUChar_t:
@@ -883,16 +883,16 @@ void TGenCollectionStreamer::ReadMap(int nElements, TBuffer &b, const TClass *on
883883
case kIsClass:
884884
b.StreamObject(i, v->fType);
885885
break;
886-
case kBIT_ISSTRING:
886+
case EProperty(kBIT_ISSTRING):
887887
i->read_std_string(b);
888888
break;
889-
case kIsPointer | kIsClass:
889+
case EProperty(kIsPointer | kIsClass):
890890
i->set(b.ReadObjectAny(v->fType));
891891
break;
892-
case kIsPointer | kBIT_ISSTRING:
892+
case EProperty(kIsPointer | kBIT_ISSTRING):
893893
i->read_std_string_pointer(b);
894894
break;
895-
case kIsPointer | kBIT_ISTSTRING | kIsClass:
895+
case EProperty(kIsPointer | kBIT_ISTSTRING | kIsClass):
896896
i->read_tstring_pointer(vsn3, b);
897897
break;
898898
}
@@ -953,7 +953,7 @@ void TGenCollectionStreamer::WritePrimitives(int nElements, TBuffer &b)
953953
case kDouble_t:
954954
b.WriteFastArray(&itm->dbl , nElements);
955955
break;
956-
case kBOOL_t:
956+
case EDataType(kBOOL_t):
957957
b.WriteFastArray(&itm->boolean , nElements);
958958
break;
959959
case kUChar_t:
@@ -1081,7 +1081,7 @@ void TGenCollectionStreamer::WriteMap(int nElements, TBuffer &b)
10811081
case kDouble_t:
10821082
b << i->dbl;
10831083
break;
1084-
case kBOOL_t:
1084+
case EDataType(kBOOL_t):
10851085
b << i->boolean;
10861086
break;
10871087
case kUChar_t:
@@ -1169,7 +1169,7 @@ void TGenCollectionStreamer::ConvertBufferVectorPrimitivesDouble32(TBuffer &b, v
11691169
template <typename To>
11701170
void TGenCollectionStreamer::DispatchConvertBufferVectorPrimitives(TBuffer &b, void *obj, Int_t nElements, const TVirtualCollectionProxy *onFileProxy)
11711171
{
1172-
switch (onFileProxy->GetType()) {
1172+
switch ((TStreamerInfo::EReadWrite)onFileProxy->GetType()) {
11731173
case TStreamerInfo::kBool: ConvertBufferVectorPrimitives<Bool_t ,To>(b,obj,nElements); break;
11741174
case TStreamerInfo::kChar: ConvertBufferVectorPrimitives<Char_t ,To>(b,obj,nElements); break;
11751175
case TStreamerInfo::kShort: ConvertBufferVectorPrimitives<Short_t ,To>(b,obj,nElements); break;
@@ -1294,7 +1294,7 @@ void TGenCollectionStreamer::ReadBufferDefault(TBuffer &b, void *obj, const TCla
12941294
case kDouble_t:
12951295
fReadBufferFunc = &TGenCollectionStreamer::ReadBufferVectorPrimitives<Double_t>;
12961296
break;
1297-
// case kBOOL_t:
1297+
// case EDataType_t(kBOOL_t):
12981298
// fReadBufferFunc = &ReadBufferVectorPrimitives<>;
12991299
// break;
13001300
case kUChar_t:

‎tree/tree/src/TBranchElement.cxx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4420,7 +4420,7 @@ void TBranchElement::SetAddress(void* addr)
44204420
fIterators = new TVirtualCollectionIterators(fCollProxy);
44214421
}
44224422
}
4423-
else if (newProxy && oldProxy && (oldProxy->HasPointers() == newProxy->HasPointers()) && (oldProxy->GetValueClass()!=0) && (newProxy->GetValueClass()!=0)) {
4423+
else if (newProxy && (oldProxy->HasPointers() == newProxy->HasPointers()) && (oldProxy->GetValueClass()!=0) && (newProxy->GetValueClass()!=0)) {
44244424
// Let see if there is a rule to convert the content of the collection into each other.
44254425
if (newType->GetSchemaRules()->HasRuleWithSourceClass( oldProxy->GetCollectionClass()->GetName())) {
44264426
TClass *oldValueClass = oldProxy->GetValueClass();

0 commit comments

Comments
 (0)