Synchronize on NetBSD-CVS (2013/12/1 12:00:00 UTC)
- Fix for possible unset uid/gid in toproto
- Fix for default mtree style
- Update libelf
- Importing libexecinfo
- Resynchronize GCC, mpc, gmp, mpfr
- build.sh: Replace params with show-params.
This has been done as the make target has been renamed in the same
way, while a new target named params has been added. This new
target generates a file containing all the parameters, instead of
printing it on the console.
- Update test48 with new etc/services (Fix by Ben Gras <ben@minix3.org)
get getservbyport() out of the inner loop
Change-Id: Ie6ad5226fa2621ff9f0dee8782ea48f9443d2091
This commit is contained in:
6
external/bsd/kyua-cli/dist/utils/units.cpp
vendored
6
external/bsd/kyua-cli/dist/utils/units.cpp
vendored
@@ -143,13 +143,13 @@ units::bytes::operator uint64_t(void) const
|
||||
///
|
||||
/// \post The bad bit of input is set to 1 if the parsing failed.
|
||||
std::istream&
|
||||
operator>>(std::istream& input, units::bytes& rhs)
|
||||
units::operator>>(std::istream& input, bytes& rhs)
|
||||
{
|
||||
std::string word;
|
||||
input >> word;
|
||||
if (input.good() || input.eof()) {
|
||||
try {
|
||||
rhs = units::bytes::parse(word);
|
||||
rhs = bytes::parse(word);
|
||||
} catch (const std::runtime_error& e) {
|
||||
input.setstate(std::ios::badbit);
|
||||
}
|
||||
@@ -166,7 +166,7 @@ operator>>(std::istream& input, units::bytes& rhs)
|
||||
///
|
||||
/// \return The output stream.
|
||||
std::ostream&
|
||||
operator<<(std::ostream& output, const units::bytes& rhs)
|
||||
units::operator<<(std::ostream& output, const bytes& rhs)
|
||||
{
|
||||
return (output << rhs.format());
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user