aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2016-08-09 02:18:26 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2016-08-09 03:05:31 +0800
commit5d9347f0225d62c51fc4a8a846eaf0468c3077b9 (patch)
tree8f72a2402d7b7217315b50984171a16288a4cb3a
parentf1df3dee537e827bc4f74ed92ab8a58cd4cf2ac0 (diff)
downloaddexon-solidity-5d9347f0225d62c51fc4a8a846eaf0468c3077b9.tar
dexon-solidity-5d9347f0225d62c51fc4a8a846eaf0468c3077b9.tar.gz
dexon-solidity-5d9347f0225d62c51fc4a8a846eaf0468c3077b9.tar.bz2
dexon-solidity-5d9347f0225d62c51fc4a8a846eaf0468c3077b9.tar.lz
dexon-solidity-5d9347f0225d62c51fc4a8a846eaf0468c3077b9.tar.xz
dexon-solidity-5d9347f0225d62c51fc4a8a846eaf0468c3077b9.tar.zst
dexon-solidity-5d9347f0225d62c51fc4a8a846eaf0468c3077b9.zip
Remove dev::utf8 namespace
-rw-r--r--libdevcore/UTF8.cpp5
-rw-r--r--libdevcore/UTF8.h5
-rw-r--r--libsolidity/ast/Types.cpp2
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 + "\"";