piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Try to fix VC++ errors

Browse Source
This commit is contained in:
Bertrand Songis
2015-09-17 22:37:53 +02:00
parent e65c131c75
commit 9f8a1d5f97
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/eeprominterface.cpp
+11 -8
View File
@@ -1693,10 +1693,11 @@ unsigned long LoadEeprom(RadioData &radioData, const uint8_t *eeprom, const int
std::bitset<NUM_ERRORS> errors;
foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
std::bitset<NUM_ERRORS> result(eepromInterface->load(radioData, eeprom, size));
std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->load(radioData, eeprom, size));
if (result.test(NO_ERROR)) {
return result.to_ulong();
} else {
}
else {
errors |= result;
}
}
@@ -1707,15 +1708,16 @@ unsigned long LoadEeprom(RadioData &radioData, const uint8_t *eeprom, const int
return errors.to_ulong();
}
unsigned long LoadBackup(RadioData &radioData, uint8_t *eeprom, int size, int index)
unsigned long LoadBackup(RadioData & radioData, uint8_t * eeprom, int size, int index)
{
std::bitset<NUM_ERRORS> errors;
foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
std::bitset<NUM_ERRORS> result(eepromInterface->loadBackup(radioData, eeprom, size, index));
std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->loadBackup(radioData, eeprom, size, index));
if (result.test(NO_ERROR)) {
return result.to_ulong();
} else {
}
else {
errors |= result;
}
}
@@ -1727,15 +1729,16 @@ unsigned long LoadBackup(RadioData &radioData, uint8_t *eeprom, int size, int in
}
unsigned long LoadEepromXml(RadioData &radioData, QDomDocument &doc)
unsigned long LoadEepromXml(RadioData & radioData, QDomDocument & doc)
{
std::bitset<NUM_ERRORS> errors;
foreach(EEPROMInterface *eepromInterface, eepromInterfaces) {
std::bitset<NUM_ERRORS> result(eepromInterface->loadxml(radioData, doc));
std::bitset<NUM_ERRORS> result((unsigned long long)eepromInterface->loadxml(radioData, doc));
if (result.test(NO_ERROR)) {
return result.to_ulong();
} else {
}
else {
errors |= result;
}
}