Skip to content

Commit 3d7984d

Browse files
authored
Fix warning in iomapper. (KhronosGroup#2449)
ATT.
1 parent 8c1a3a0 commit 3d7984d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

glslang/MachineIndependent/iomapper.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,13 +371,13 @@ struct TSymbolValidater
371371
}
372372
else if (overlapLocation >= 0) {
373373
if (diffLocation == true) {
374-
TString err = "Uniform location should be equal for same uniforms: " + overlapLocation;
374+
TString err = ("Uniform location should be equal for same uniforms: " +std::to_string(overlapLocation)).c_str();
375375
infoSink.info.message(EPrefixInternalError, err.c_str());
376376
hadError = true;
377377
break;
378378
}
379379
else {
380-
TString err = "Uniform location overlaps across stages: " + overlapLocation;
380+
TString err = ("Uniform location overlaps across stages: " + std::to_string(overlapLocation)).c_str();
381381
infoSink.info.message(EPrefixInternalError, err.c_str());
382382
hadError = true;
383383
break;
@@ -626,8 +626,8 @@ struct TSymbolValidater
626626
const TQualifier& qualifier1 = type1->getQualifier();
627627
const TQualifier& qualifier2 = type2->getQualifier();
628628

629-
if (isBlock == false &&
630-
(type1->getQualifier().storage == EvqUniform && type2->getQualifier().storage == EvqUniform) ||
629+
if (((isBlock == false) &&
630+
(type1->getQualifier().storage == EvqUniform && type2->getQualifier().storage == EvqUniform)) ||
631631
(type1->getQualifier().storage == EvqGlobal && type2->getQualifier().storage == EvqGlobal)) {
632632
if (qualifier1.precision != qualifier2.precision) {
633633
hasError = true;

0 commit comments

Comments
 (0)