mirror of
https://github.com/NixOS/nix
synced 2025-06-25 14:51:16 +02:00
Remove std::string alias (for real this time)
Also use std::string_view in a few more places.
This commit is contained in:
parent
14b38d0887
commit
df552ff53e
110 changed files with 773 additions and 681 deletions
|
@ -391,7 +391,7 @@ size_t readString(char * buf, size_t max, Source & source)
|
|||
}
|
||||
|
||||
|
||||
string readString(Source & source, size_t max)
|
||||
std::string readString(Source & source, size_t max)
|
||||
{
|
||||
auto len = readNum<size_t>(source);
|
||||
if (len > max) throw SerialisationError("string is too long");
|
||||
|
@ -401,7 +401,7 @@ string readString(Source & source, size_t max)
|
|||
return res;
|
||||
}
|
||||
|
||||
Source & operator >> (Source & in, string & s)
|
||||
Source & operator >> (Source & in, std::string & s)
|
||||
{
|
||||
s = readString(in);
|
||||
return in;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue