diff options
| -rw-r--r-- | libdevcore/UTF8.cpp | 5 | ||||
| -rw-r--r-- | libdevcore/UTF8.h | 5 | ||||
| -rw-r--r-- | libsolidity/ast/Types.cpp | 2 |
3 files changed, 1 insertions, 11 deletions
diff --git a/libdevcore/UTF8.cpp b/libdevcore/UTF8.cpp index a71693a8..d742fe66 100644 --- a/libdevcore/UTF8.cpp +++ b/libdevcore/UTF8.cpp @@ -27,9 +27,6 @@ namespace dev { -namespace utf8 -{ - bool validate(std::string const& _input, size_t& _invalidPosition) { @@ -82,5 +79,3 @@ bool validate(std::string const& _input, size_t& _invalidPosition) } - -} diff --git a/libdevcore/UTF8.h b/libdevcore/UTF8.h index d6959f3e..3e39273c 100644 --- a/libdevcore/UTF8.h +++ b/libdevcore/UTF8.h @@ -28,13 +28,8 @@ namespace dev { -namespace utf8 -{ - /// Validate an input for UTF8 encoding /// @returns true if it is invalid and the first invalid position in invalidPosition bool validate(std::string const& _input, size_t& _invalidPosition); } - -} diff --git a/libsolidity/ast/Types.cpp b/libsolidity/ast/Types.cpp index aae18934..28f7e1b7 100644 --- a/libsolidity/ast/Types.cpp +++ b/libsolidity/ast/Types.cpp @@ -857,7 +857,7 @@ std::string StringLiteralType::toString(bool) const { 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 \"" + m_value + "\""; |