Fix -Wstring-plus-int warning on clang

This commit is contained in:
Jack Grigg 2018-05-01 14:55:47 +01:00
parent 23f8b30c88
commit 1f9dfbb9f0
No known key found for this signature in database
GPG Key ID: 665DBCD284F7DAFF
4 changed files with 5 additions and 5 deletions

View File

@ -143,7 +143,7 @@ bool CCoinsViewCache::GetNullifier(const uint256 &nullifier, NullifierType type)
cacheToUse = &cacheSaplingNullifiers; cacheToUse = &cacheSaplingNullifiers;
break; break;
default: default:
throw std::runtime_error("Unknown nullifier type " + type); throw std::runtime_error("Unknown nullifier type");
} }
CNullifiersMap::iterator it = cacheToUse->find(nullifier); CNullifiersMap::iterator it = cacheToUse->find(nullifier);
if (it != cacheToUse->end()) if (it != cacheToUse->end())

View File

@ -63,7 +63,7 @@ public:
mapToUse = &mapSaplingNullifiers_; mapToUse = &mapSaplingNullifiers_;
break; break;
default: default:
throw std::runtime_error("Unknown nullifier type " + type); throw std::runtime_error("Unknown nullifier type");
} }
std::map<uint256, bool>::const_iterator it = mapToUse->find(nf); std::map<uint256, bool>::const_iterator it = mapToUse->find(nf);
if (it == mapToUse->end()) { if (it == mapToUse->end()) {

View File

@ -63,7 +63,7 @@ bool CCoinsViewDB::GetNullifier(const uint256 &nf, NullifierType type) const {
dbChar = DB_SAPLING_NULLIFIER; dbChar = DB_SAPLING_NULLIFIER;
break; break;
default: default:
throw runtime_error("Unknown nullifier type " + type); throw runtime_error("Unknown nullifier type");
} }
return db.Read(make_pair(dbChar, nf), spent); return db.Read(make_pair(dbChar, nf), spent);
} }

View File

@ -470,7 +470,7 @@ void CTxMemPool::checkNullifiers(NullifierType type) const
mapToUse = &mapSaplingNullifiers; mapToUse = &mapSaplingNullifiers;
break; break;
default: default:
throw runtime_error("Unknown nullifier type " + type); throw runtime_error("Unknown nullifier type");
} }
for (const auto& entry : *mapToUse) { for (const auto& entry : *mapToUse) {
uint256 hash = entry.second->GetHash(); uint256 hash = entry.second->GetHash();
@ -590,7 +590,7 @@ bool CTxMemPool::nullifierExists(const uint256& nullifier, NullifierType type) c
case SAPLING_NULLIFIER: case SAPLING_NULLIFIER:
return mapSaplingNullifiers.count(nullifier); return mapSaplingNullifiers.count(nullifier);
default: default:
throw runtime_error("Unknown nullifier type " + type); throw runtime_error("Unknown nullifier type");
} }
} }