Remove dev::utf8 namespace

This commit is contained in:
Alex Beregszaszi 2016-08-08 19:18:26 +01:00
parent f1df3dee53
commit 5d9347f022
3 changed files with 1 additions and 11 deletions

View File

@ -27,9 +27,6 @@
namespace dev namespace dev
{ {
namespace utf8
{
bool validate(std::string const& _input, size_t& _invalidPosition) bool validate(std::string const& _input, size_t& _invalidPosition)
{ {
@ -81,6 +78,4 @@ bool validate(std::string const& _input, size_t& _invalidPosition)
} }
}
} }

View File

@ -28,13 +28,8 @@
namespace dev namespace dev
{ {
namespace utf8
{
/// Validate an input for UTF8 encoding /// Validate an input for UTF8 encoding
/// @returns true if it is invalid and the first invalid position in invalidPosition /// @returns true if it is invalid and the first invalid position in invalidPosition
bool validate(std::string const& _input, size_t& _invalidPosition); bool validate(std::string const& _input, size_t& _invalidPosition);
} }
}

View File

@ -857,7 +857,7 @@ std::string StringLiteralType::toString(bool) const
{ {
size_t invalidSequence; size_t invalidSequence;
if (!dev::utf8::validate(m_value, invalidSequence)) if (!dev::validate(m_value, invalidSequence))
return "literal_string (contains invalid UTF-8 sequence at position " + dev::toString(invalidSequence) + ")"; return "literal_string (contains invalid UTF-8 sequence at position " + dev::toString(invalidSequence) + ")";
return "literal_string \"" + m_value + "\""; return "literal_string \"" + m_value + "\"";