ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-26 05:55:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

General tidy and refactoring:

Browse Source 
* Use nullptr (C++11) instead of NULL.
* Put each file into its own namespace declaration.
* Remove "using namespace" directives and add scope qualifiers.
* Control when beast's implementation of std::equal (C++14) is used.
* Tidy up some const declarations.

Conflicts:
	src/ripple_app/shamap/SHAMapSync.cpp
	src/ripple_app/tx/TransactionEngine.cpp
This commit is contained in:
Howard Hinnant
2014-03-07 18:54:11 -05:00
committed by Vinnie Falco
parent c581ffb8a4
commit cad50c68a8
519 changed files with 3618 additions and 2726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/ripple_basics/utility/StringUtilities.cpp
View File

@@ -46,7 +46,7 @@ std::string strprintf (const char* format, ...)
limit *= 2;
p = new char[limit];
if (p == NULL)
if (p == nullptr)
throw std::bad_alloc ();
}
@@ -217,7 +217,7 @@ bool parseIpPort (const std::string& strSource, std::string& strIP, int& iPort)
if (bValid)
{
strIP = addrIP.to_string ();
iPort = strPortRaw.empty () ? -1 : lexicalCastThrow <int> (strPortRaw);
iPort = strPortRaw.empty () ? -1 : beast::lexicalCastThrow <int> (strPortRaw);
}
}
@@ -243,7 +243,7 @@ bool parseUrl (const std::string& strUrl, std::string& strScheme, std::string& s
boost::algorithm::to_lower (strScheme);
iPort = strPort.empty () ? -1 : lexicalCast <int> (strPort);
iPort = strPort.empty () ? -1 : beast::lexicalCast <int> (strPort);
// Log::out() << strUrl << " : " << bMatch << " : '" << strDomain << "' : '" << strPort << "' : " << iPort << " : '" << strPath << "'";
}
@@ -256,28 +256,29 @@ bool parseUrl (const std::string& strUrl, std::string& strScheme, std::string& s
// Quality parsing
// - integers as is.
// - floats multiplied by a billion
bool parseQuality (const std::string& strSource, uint32& uQuality)
bool parseQuality (const std::string& strSource, beast::uint32& uQuality)
{
uQuality = lexicalCast <uint32> (strSource);
uQuality = beast::lexicalCast <beast::uint32> (strSource);
if (!uQuality)
{
float fQuality = lexicalCast <float> (strSource);
float fQuality = beast::lexicalCast <float> (strSource);
if (fQuality)
uQuality = (uint32) (QUALITY_ONE * fQuality);
uQuality = (beast::uint32) (QUALITY_ONE * fQuality);
}
return !!uQuality;
}
StringPairArray parseDelimitedKeyValueString (String parameters, beast_wchar delimiter)
beast::StringPairArray parseDelimitedKeyValueString (beast::String parameters,
beast::beast_wchar delimiter)
{
StringPairArray keyValues;
beast::StringPairArray keyValues;
while (parameters.isNotEmpty ())
{
String pair;
beast::String pair;
{
int const delimiterPos = parameters.indexOfChar (delimiter);
@@ -292,7 +293,7 @@ StringPairArray parseDelimitedKeyValueString (String parameters, beast_wchar del
{
pair = parameters;
parameters = String::empty;
parameters = beast::String::empty;
}
}
@@ -300,8 +301,8 @@ StringPairArray parseDelimitedKeyValueString (String parameters, beast_wchar del
if (equalPos != -1)
{
String const key = pair.substring (0, equalPos);
String const value = pair.substring (equalPos + 1, pair.length ());
beast::String const key = pair.substring (0, equalPos);
beast::String const value = pair.substring (equalPos + 1, pair.length ());
keyValues.set (key, value);
}
@@ -312,7 +313,7 @@ StringPairArray parseDelimitedKeyValueString (String parameters, beast_wchar del
//------------------------------------------------------------------------------
class StringUtilitiesTests : public UnitTest
class StringUtilitiesTests : public beast::UnitTest
{
public:
void testUnHexSuccess (std::string strIn, std::string strExpected)