Skip to content

Commit ad79325

Browse files
nikola-maticcameel
nikola-matic
authored and
cameel
committed
Purge using namespace std from libsolutil
1 parent ef5f131 commit ad79325

12 files changed

+127
-139
lines changed

‎libsolutil/CommonData.cpp

+20-21
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929

3030
#include <boost/algorithm/string.hpp>
3131

32-
using namespace std;
3332
using namespace solidity;
3433
using namespace solidity::util;
3534

@@ -41,7 +40,7 @@ static char const* lowerHexChars = "0123456789abcdef";
4140

4241
}
4342

44-
string solidity::util::toHex(uint8_t _data, HexCase _case)
43+
std::string solidity::util::toHex(uint8_t _data, HexCase _case)
4544
{
4645
assertThrow(_case != HexCase::Mixed, BadHexCase, "Mixed case can only be used for byte arrays.");
4746

@@ -53,7 +52,7 @@ string solidity::util::toHex(uint8_t _data, HexCase _case)
5352
};
5453
}
5554

56-
string solidity::util::toHex(bytes const& _data, HexPrefix _prefix, HexCase _case)
55+
std::string solidity::util::toHex(bytes const& _data, HexPrefix _prefix, HexCase _case)
5756
{
5857
std::string ret(_data.size() * 2 + (_prefix == HexPrefix::Add ? 2 : 0), 0);
5958

@@ -90,7 +89,7 @@ int solidity::util::fromHex(char _i, WhenError _throw)
9089
if (_i >= 'A' && _i <= 'F')
9190
return _i - 'A' + 10;
9291
if (_throw == WhenError::Throw)
93-
assertThrow(false, BadHexCharacter, to_string(_i));
92+
assertThrow(false, BadHexCharacter, std::to_string(_i));
9493
else
9594
return -1;
9695
}
@@ -125,31 +124,31 @@ bytes solidity::util::fromHex(std::string const& _s, WhenError _throw)
125124
}
126125

127126

128-
bool solidity::util::passesAddressChecksum(string const& _str, bool _strict)
127+
bool solidity::util::passesAddressChecksum(std::string const& _str, bool _strict)
129128
{
130-
string s = _str.substr(0, 2) == "0x" ? _str : "0x" + _str;
129+
std::string s = _str.substr(0, 2) == "0x" ? _str : "0x" + _str;
131130

132131
if (s.length() != 42)
133132
return false;
134133

135134
if (!_strict && (
136-
s.find_first_of("abcdef") == string::npos ||
137-
s.find_first_of("ABCDEF") == string::npos
135+
s.find_first_of("abcdef") == std::string::npos ||
136+
s.find_first_of("ABCDEF") == std::string::npos
138137
))
139138
return true;
140139

141140
return s == solidity::util::getChecksummedAddress(s);
142141
}
143142

144-
string solidity::util::getChecksummedAddress(string const& _addr)
143+
std::string solidity::util::getChecksummedAddress(std::string const& _addr)
145144
{
146-
string s = _addr.substr(0, 2) == "0x" ? _addr.substr(2) : _addr;
145+
std::string s = _addr.substr(0, 2) == "0x" ? _addr.substr(2) : _addr;
147146
assertThrow(s.length() == 40, InvalidAddress, "");
148-
assertThrow(s.find_first_not_of("0123456789abcdefABCDEF") == string::npos, InvalidAddress, "");
147+
assertThrow(s.find_first_not_of("0123456789abcdefABCDEF") == std::string::npos, InvalidAddress, "");
149148

150149
h256 hash = keccak256(boost::algorithm::to_lower_copy(s, std::locale::classic()));
151150

152-
string ret = "0x";
151+
std::string ret = "0x";
153152
for (unsigned i = 0; i < 40; ++i)
154153
{
155154
char addressCharacter = s[i];
@@ -162,16 +161,16 @@ string solidity::util::getChecksummedAddress(string const& _addr)
162161
return ret;
163162
}
164163

165-
bool solidity::util::isValidHex(string const& _string)
164+
bool solidity::util::isValidHex(std::string const& _string)
166165
{
167166
if (_string.substr(0, 2) != "0x")
168167
return false;
169-
if (_string.find_first_not_of("0123456789abcdefABCDEF", 2) != string::npos)
168+
if (_string.find_first_not_of("0123456789abcdefABCDEF", 2) != std::string::npos)
170169
return false;
171170
return true;
172171
}
173172

174-
bool solidity::util::isValidDecimal(string const& _string)
173+
bool solidity::util::isValidDecimal(std::string const& _string)
175174
{
176175
if (_string.empty())
177176
return false;
@@ -180,12 +179,12 @@ bool solidity::util::isValidDecimal(string const& _string)
180179
// No leading zeros
181180
if (_string.front() == '0')
182181
return false;
183-
if (_string.find_first_not_of("0123456789") != string::npos)
182+
if (_string.find_first_not_of("0123456789") != std::string::npos)
184183
return false;
185184
return true;
186185
}
187186

188-
string solidity::util::formatAsStringOrNumber(string const& _value)
187+
std::string solidity::util::formatAsStringOrNumber(std::string const& _value)
189188
{
190189
assertThrow(_value.length() <= 32, StringTooLong, "String to be formatted longer than 32 bytes.");
191190

@@ -197,9 +196,9 @@ string solidity::util::formatAsStringOrNumber(string const& _value)
197196
}
198197

199198

200-
string solidity::util::escapeAndQuoteString(string const& _input)
199+
std::string solidity::util::escapeAndQuoteString(std::string const& _input)
201200
{
202-
string out;
201+
std::string out;
203202

204203
for (char c: _input)
205204
if (c == '\\')
@@ -214,8 +213,8 @@ string solidity::util::escapeAndQuoteString(string const& _input)
214213
out += "\\t";
215214
else if (!isPrint(c))
216215
{
217-
ostringstream o;
218-
o << "\\x" << std::hex << setfill('0') << setw(2) << (unsigned)(unsigned char)(c);
216+
std::ostringstream o;
217+
o << "\\x" << std::hex << std::setfill('0') << std::setw(2) << (unsigned)(unsigned char)(c);
219218
out += o.str();
220219
}
221220
else

‎libsolutil/CommonIO.cpp

+12-13
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
#include <termios.h>
3232
#endif
3333

34-
using namespace std;
3534
using namespace solidity::util;
3635

3736
namespace
@@ -55,35 +54,35 @@ inline T readFile(boost::filesystem::path const& _file)
5554

5655
// get length of file:
5756
is.seekg(0, is.end);
58-
streamoff length = is.tellg();
57+
std::streamoff length = is.tellg();
5958
if (length == 0)
6059
return ret; // do not read empty file (MSVC does not like it)
6160
is.seekg(0, is.beg);
6261

6362
ret.resize((static_cast<size_t>(length) + c_elementSize - 1) / c_elementSize);
64-
is.read(const_cast<char*>(reinterpret_cast<char const*>(ret.data())), static_cast<streamsize>(length));
63+
is.read(const_cast<char*>(reinterpret_cast<char const*>(ret.data())), static_cast<std::streamsize>(length));
6564
return ret;
6665
}
6766

6867
}
6968

70-
string solidity::util::readFileAsString(boost::filesystem::path const& _file)
69+
std::string solidity::util::readFileAsString(boost::filesystem::path const& _file)
7170
{
72-
return readFile<string>(_file);
71+
return readFile<std::string>(_file);
7372
}
7473

75-
string solidity::util::readUntilEnd(istream& _stdin)
74+
std::string solidity::util::readUntilEnd(std::istream& _stdin)
7675
{
77-
ostringstream ss;
76+
std::ostringstream ss;
7877
ss << _stdin.rdbuf();
7978
return ss.str();
8079
}
8180

82-
string solidity::util::readBytes(istream& _input, size_t _length)
81+
std::string solidity::util::readBytes(std::istream& _input, size_t _length)
8382
{
84-
string output;
83+
std::string output;
8584
output.resize(_length);
86-
_input.read(output.data(), static_cast<streamsize>(_length));
85+
_input.read(output.data(), static_cast<std::streamsize>(_length));
8786
// If read() reads fewer bytes it sets failbit in addition to eofbit.
8887
if (_input.fail())
8988
output.resize(static_cast<size_t>(_input.gcount()));
@@ -135,10 +134,10 @@ class DisableConsoleBuffering
135134
int solidity::util::readStandardInputChar()
136135
{
137136
DisableConsoleBuffering disableConsoleBuffering;
138-
return cin.get();
137+
return std::cin.get();
139138
}
140139

141-
string solidity::util::absolutePath(string const& _path, string const& _reference)
140+
std::string solidity::util::absolutePath(std::string const& _path, std::string const& _reference)
142141
{
143142
boost::filesystem::path p(_path);
144143
// Anything that does not start with `.` is an absolute path.
@@ -158,6 +157,6 @@ string solidity::util::absolutePath(string const& _path, string const& _referenc
158157
return result.generic_string();
159158
}
160159

161-
string solidity::util::sanitizePath(string const& _path) {
160+
std::string solidity::util::sanitizePath(std::string const& _path) {
162161
return boost::filesystem::path(_path).generic_string();
163162
}

‎libsolutil/Exceptions.cpp

+5-6
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,12 @@
1818

1919
#include <libsolutil/Exceptions.h>
2020

21-
using namespace std;
2221
using namespace solidity::util;
2322

2423
char const* Exception::what() const noexcept
2524
{
2625
// Return the comment if available.
27-
if (string const* cmt = comment())
26+
if (std::string const* cmt = comment())
2827
return cmt->data();
2928

3029
// Fallback to base what().
@@ -33,20 +32,20 @@ char const* Exception::what() const noexcept
3332
return std::exception::what();
3433
}
3534

36-
string Exception::lineInfo() const
35+
std::string Exception::lineInfo() const
3736
{
3837
char const* const* file = boost::get_error_info<boost::throw_file>(*this);
3938
int const* line = boost::get_error_info<boost::throw_line>(*this);
40-
string ret;
39+
std::string ret;
4140
if (file)
4241
ret += *file;
4342
ret += ':';
4443
if (line)
45-
ret += to_string(*line);
44+
ret += std::to_string(*line);
4645
return ret;
4746
}
4847

49-
string const* Exception::comment() const noexcept
48+
std::string const* Exception::comment() const noexcept
5049
{
5150
return boost::get_error_info<errinfo_comment>(*this);
5251
}

‎libsolutil/IndentedWriter.cpp

+6-7
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,20 @@
2323
#include <libsolutil/IndentedWriter.h>
2424
#include <libsolutil/Assertions.h>
2525

26-
using namespace std;
2726
using namespace solidity::util;
2827

29-
string IndentedWriter::format() const
28+
std::string IndentedWriter::format() const
3029
{
31-
string result;
30+
std::string result;
3231
for (auto const& line: m_lines)
33-
result += string(line.indentation * 4, ' ') + line.contents + "\n";
32+
result += std::string(line.indentation * 4, ' ') + line.contents + "\n";
3433
return result;
3534
}
3635

3736
void IndentedWriter::newLine()
3837
{
3938
if (!m_lines.back().contents.empty())
40-
m_lines.emplace_back(Line{string(), m_lines.back().indentation});
39+
m_lines.emplace_back(Line{std::string(), m_lines.back().indentation});
4140
}
4241

4342
void IndentedWriter::indent()
@@ -53,12 +52,12 @@ void IndentedWriter::unindent()
5352
m_lines.back().indentation--;
5453
}
5554

56-
void IndentedWriter::add(string const& _str)
55+
void IndentedWriter::add(std::string const& _str)
5756
{
5857
m_lines.back().contents += _str;
5958
}
6059

61-
void IndentedWriter::addLine(string const& _line)
60+
void IndentedWriter::addLine(std::string const& _line)
6261
{
6362
newLine();
6463
add(_line);

‎libsolutil/IpfsHash.cpp

+7-8
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#include <libsolutil/CommonData.h>
2424
#include <libsolutil/Numeric.h>
2525

26-
using namespace std;
2726
using namespace solidity;
2827
using namespace solidity::util;
2928

@@ -56,11 +55,11 @@ bytes encodeLinkData(bytes const& _data)
5655
return bytes{0x12} + varintEncoding(_data.size()) + _data;
5756
}
5857

59-
string base58Encode(bytes const& _data)
58+
std::string base58Encode(bytes const& _data)
6059
{
61-
static string const alphabet{"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"};
60+
static std::string const alphabet{"123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz"};
6261
bigint data(util::toHex(_data, HexPrefix::Add));
63-
string output;
62+
std::string output;
6463
while (data)
6564
{
6665
output += alphabet[static_cast<size_t>(data % alphabet.size())];
@@ -84,7 +83,7 @@ struct Chunk
8483
size_t blockSize = 0;
8584
};
8685

87-
using Chunks = vector<Chunk>;
86+
using Chunks = std::vector<Chunk>;
8887

8988
Chunk combineLinks(Chunks& _links)
9089
{
@@ -153,7 +152,7 @@ bytes groupChunksBottomUp(Chunks _currentLevel)
153152
}
154153
}
155154

156-
bytes solidity::util::ipfsHash(string _data)
155+
bytes solidity::util::ipfsHash(std::string _data)
157156
{
158157
size_t const maxChunkSize = 1024 * 256;
159158
size_t chunkCount = _data.length() / maxChunkSize + (_data.length() % maxChunkSize > 0 ? 1 : 0);
@@ -164,7 +163,7 @@ bytes solidity::util::ipfsHash(string _data)
164163
for (size_t chunkIndex = 0; chunkIndex < chunkCount; chunkIndex++)
165164
{
166165
bytes chunkBytes = asBytes(
167-
_data.substr(chunkIndex * maxChunkSize, min(maxChunkSize, _data.length() - chunkIndex * maxChunkSize))
166+
_data.substr(chunkIndex * maxChunkSize, std::min(maxChunkSize, _data.length() - chunkIndex * maxChunkSize))
168167
);
169168

170169
bytes lengthAsVarint = varintEncoding(chunkBytes.size());
@@ -197,7 +196,7 @@ bytes solidity::util::ipfsHash(string _data)
197196
return groupChunksBottomUp(std::move(allChunks));
198197
}
199198

200-
string solidity::util::ipfsHashBase58(string _data)
199+
std::string solidity::util::ipfsHashBase58(std::string _data)
201200
{
202201
return base58Encode(ipfsHash(std::move(_data)));
203202
}

0 commit comments

Comments
 (0)