Fix operator precedence issue.

Addition evaluates before the ternary operator, which resulted in the wrong sizes being computed. Bug 28346104 Change-Id: Id28843132097a4fb1599eed19c05f479f16f1315 Reviewed-on: https://swiftshader-review.googlesource.com/5187Reviewed-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com> Tested-by: Nicolas Capens <capn@google.com>

Fix operator precedence issue.
5b87ebf2 · Nicolas Capens · cce6c4e1 · 5b87ebf2
Commit 5b87ebf2 authored Apr 25, 2016 by Nicolas Capens
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

DLL.cpp src/Reactor/DLL.cpp +2 -2

No files found.
--- a/src/Reactor/DLL.cpp
+++ b/src/Reactor/DLL.cpp
@@ -108,7 +108,7 @@ namespace sw
 		DOSheader.e_lfanew = sizeof(DOSheader);
 		int base = 0x10000000;
-		int codePage = pageAlign(sizeof(DOSheader) + AMD64 ? sizeof(COFFheader64) : sizeof(COFFheader32));
+		int codePage = pageAlign(sizeof(DOSheader) + (AMD64 ? sizeof(COFFheader64) : sizeof(COFFheader32)));
 		int exportsPage = codePage + pageAlign(codeSize);
 		int exportsSize = (int)(sizeof(IMAGE_EXPORT_DIRECTORY) + functionList.size() * sizeof(void*) + (strlen(dllName) + 1));
 		int relocPage = exportsPage + pageAlign(exportsSize);
@@ -227,7 +227,7 @@ namespace sw
 		textSection.Misc.VirtualSize = pageAlign(codeSize);
 		textSection.VirtualAddress = codePage;
 		textSection.SizeOfRawData = fileAlign(codeSize);
-		textSection.PointerToRawData = fileAlign(sizeof(DOSheader) + AMD64 ? sizeof(COFFheader64) : sizeof(COFFheader32));
+		textSection.PointerToRawData = fileAlign(sizeof(DOSheader) + (AMD64 ? sizeof(COFFheader64) : sizeof(COFFheader32)));
 		textSection.PointerToRelocations = 0;
 		textSection.PointerToLinenumbers = 0;
 		textSection.NumberOfRelocations = 0;