Merge pull request #1265 from bnamasivayam/trying-to-fix-msvc14-issue

Code refactor to fix windows msvc14 compiler errors.
This commit is contained in:
Jingyu Zhou 2019-03-08 15:39:56 -08:00 committed by GitHub
commit 17710ae143
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3651,8 +3651,9 @@ public:
oldRestore.clear(tr);
}
for (auto &restoreRange : restoreRanges) {
KeyRange restoreIntoRange = KeyRangeRef(restoreRange.begin, restoreRange.end).removePrefix(removePrefix).withPrefix(addPrefix);
state int index;
for (index = 0; index < restoreRanges.size(); index++) {
KeyRange restoreIntoRange = KeyRangeRef(restoreRanges[index].begin, restoreRanges[index].end).removePrefix(removePrefix).withPrefix(addPrefix);
Standalone<RangeResultRef> existingRows = wait(tr->getRange(restoreIntoRange, 1));
if (existingRows.size() > 0) {
throw restore_destination_not_empty();