ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-19 18:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tidy up UnsignedInteger

Browse Source
This commit is contained in:
Vinnie Falco
2013-09-12 22:37:40 -07:00
parent 0e4c865853
commit 3b82c0b1a1
6 changed files with 73 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/beast/Builds/VisualStudio2012/beast.vcxproj
View File

@@ -323,7 +323,7 @@
<ClInclude Include="..\..\modules\beast_core\zip\zlib\zlib.h" />
<ClInclude Include="..\..\modules\beast_core\zip\zlib\zutil.h" />
<ClInclude Include="..\..\modules\beast_crypto\beast_crypto.h" />
<ClInclude Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.h" />
<ClInclude Include="..\..\modules\beast_crypto\math\UnsignedInteger.h" />
<ClInclude Include="..\..\modules\beast_db\beast_db.h" />
<ClInclude Include="..\..\modules\beast_db\keyvalue\beast_KeyvaDB.h" />
<ClInclude Include="..\..\modules\beast_extras\beast_extras.h" />
@@ -1265,7 +1265,7 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\modules\beast_crypto\beast_crypto.cpp" />
<ClCompile Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.cpp">
<ClCompile Include="..\..\modules\beast_crypto\math\UnsignedInteger.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>

12
src/beast/Builds/VisualStudio2012/beast.vcxproj.filters
View File

@@ -560,9 +560,6 @@
<ClInclude Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.h">
<Filter>beast_core\diagnostic</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.h">
<Filter>beast_crypto\math</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_crypto\beast_crypto.h">
<Filter>beast_crypto</Filter>
</ClInclude>
@@ -1028,6 +1025,9 @@
<ClInclude Include="..\..\modules\beast_core\diagnostic\Journal.h">
<Filter>beast_core\diagnostic</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\beast_crypto\math\UnsignedInteger.h">
<Filter>beast_crypto\math</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\modules\beast_core\containers\beast_AbstractFifo.cpp">
@@ -1306,9 +1306,6 @@
<ClCompile Include="..\..\modules\beast_core\diagnostic\beast_UnitTest.cpp">
<Filter>beast_core\diagnostic</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_crypto\math\beast_UnsignedInteger.cpp">
<Filter>beast_crypto\math</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_core\files\beast_RandomAccessFile.cpp">
<Filter>beast_core\files</Filter>
</ClCompile>
@@ -1552,6 +1549,9 @@
<ClCompile Include="..\..\modules\beast_core\diagnostic\Journal.cpp">
<Filter>beast_core\diagnostic</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\beast_crypto\math\UnsignedInteger.cpp">
<Filter>beast_crypto\math</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Text Include="..\..\TODO.txt" />

2
src/beast/modules/beast_crypto/beast_crypto.cpp
View File

@@ -24,6 +24,6 @@
namespace beast
{
#include "math/beast_UnsignedInteger.cpp"
#include "math/UnsignedInteger.cpp"
}

2
src/beast/modules/beast_crypto/beast_crypto.h
View File

@@ -44,7 +44,7 @@
namespace beast
{
#include "math/beast_UnsignedInteger.h"
#include "math/UnsignedInteger.h"
}

0
src/beast/modules/beast_crypto/math/beast_UnsignedInteger.cpp → src/beast/modules/beast_crypto/math/UnsignedInteger.cpp
View File

124
src/beast/modules/beast_crypto/math/beast_UnsignedInteger.h → src/beast/modules/beast_crypto/math/UnsignedInteger.h
View File

@@ -79,6 +79,8 @@ public:
HashValue m_seed;
};
//--------------------------------------------------------------------------
/** Construct the object.
The values are uninitialized.
*/
@@ -92,19 +94,35 @@ public:
this->operator= (other);
}
/** Construct from raw memory.
/** Construct from a raw memory.
The area pointed to by buffer must be at least Bytes in size,
or else undefined behavior will result.
*/
explicit UnsignedInteger (void const* buffer)
/** @{ */
explicit UnsignedInteger (void const* buf)
{
memcpy (m_byte, buffer, Bytes);
std::memcpy (begin(), buf, Bytes);
}
template <typename T>
explicit UnsignedInteger (T const* buf)
{
std::memcpy (begin(), buf, Bytes);
}
/** @} */
/** Construct from a sequence. */
template <class ForwardIterator>
UnsignedInteger (ForwardIterator start, ForwardIterator finish)
{
bassert (std::distance (start, finish) == Bytes);
std::copy (start, finish, begin());
}
/** Assign from another value. */
UnsignedInteger <Bytes>& operator= (UnsignedInteger const& other) noexcept
{
memcpy (m_byte, other.m_byte, Bytes);
std::memcpy (begin(), other.begin(), Bytes);
return *this;
}
@@ -119,7 +137,7 @@ public:
UnsignedInteger <Bytes> result;
value = toNetworkByteOrder <IntegerType> (value);
result.clear ();
memcpy (result.end () - sizeof (value), &value, bmin (Bytes, sizeof (value)));
std::memcpy (result.end () - sizeof (value), &value, bmin (Bytes, sizeof (value)));
return result;
}
@@ -132,22 +150,19 @@ public:
return result;
}
/** Fill with a particular byte value.
*/
/** Fill with a particular byte value. */
void fill (value_type value) noexcept
{
memset (m_byte, value, Bytes);
std::fill (begin(), end(), value);
}
/** Clear the contents to zero.
*/
/** Clear the contents to zero. */
void clear () noexcept
{
fill (0);
}
/** Determine if all bits are zero.
*/
/** Determine if all bits are zero. */
bool isZero () const noexcept
{
for (int i = 0; i < Bytes; ++i)
@@ -159,17 +174,14 @@ public:
return true;
}
/** Determine if any bit is non-zero.
*/
/** Determine if any bit is non-zero. */
bool isNotZero () const noexcept
{
return ! isZero ();
}
/** Support conversion to `bool`.
@return `true` if any bit is non-zero.
@see SafeBool
*/
bool asBoolean () const noexcept
@@ -177,8 +189,7 @@ public:
return isNotZero ();
}
/** Access a particular byte.
*/
/** Access a particular byte. */
value_type& getByte (int byteIndex) noexcept
{
bassert (byteIndex >= 0 && byteIndex < Bytes);
@@ -186,8 +197,7 @@ public:
return m_byte [byteIndex];
}
/** Access a particular byte as `const`.
*/
/** Access a particular byte as `const`. */
value_type getByte (int byteIndex) const noexcept
{
bassert (byteIndex >= 0 && byteIndex < Bytes);
@@ -195,99 +205,97 @@ public:
return m_byte [byteIndex];
}
/** Access a particular byte.
*/
/** Access a particular byte. */
value_type& operator[] (int byteIndex) noexcept
{
return getByte (byteIndex);
}
/** Access a particular byte as `const`.
*/
/** Access a particular byte as `const`. */
value_type const operator[] (int byteIndex) const noexcept
{
return getByte (byteIndex);
}
/** Get an iterator to the beginning.
*/
/** Get an iterator to the beginning. */
iterator begin () noexcept
{
return &m_byte [0];
}
/** Get an iterator to the end.
*/
iterator end ()
/** Get an iterator to past-the-end. */
iterator end () noexcept
{
return &m_byte [Bytes];
}
/** Get a const iterator to the beginning.
*/
/** Get a const iterator to the beginning. */
const_iterator begin () const noexcept
{
return &m_byte [0];
}
/** Get a const iterator to past-the-end. */
const_iterator end () const noexcept
{
return &m_byte [Bytes];
}
/** Get a const iterator to the beginning. */
const_iterator cbegin () const noexcept
{
return &m_byte [0];
}
/** Get a const iterator to the end.
*/
/** Get a const iterator to past-the-end. */
const_iterator cend () const noexcept
{
return &m_byte [Bytes];
}
/** Compare two objects.
*/
/** Compare two objects. */
int compare (UnsignedInteger <Bytes> const& other) const noexcept
{
return memcmp (cbegin (), other.cbegin (), Bytes);
}
/** Determine equality.
*/
/** Determine equality. */
bool operator== (UnsignedInteger <Bytes> const& other) const noexcept
{
return compare (other) == 0;
}
/** Determine inequality.
*/
/** Determine inequality. */
bool operator!= (UnsignedInteger <Bytes> const& other) const noexcept
{
return compare (other) != 0;
}
/** Ordered comparison.
*/
/** Ordered comparison. */
bool operator< (UnsignedInteger <Bytes> const& other) const noexcept
{
return compare (other) < 0;
}
/** Ordered comparison.
*/
/** Ordered comparison. */
bool operator<= (UnsignedInteger <Bytes> const& other) const noexcept
{
return compare (other) <= 0;
}
/** Ordered comparison.
*/
/** Ordered comparison. */
bool operator> (UnsignedInteger <Bytes> const& other) const noexcept
{
return compare (other) > 0;
}
/** Ordered comparison.
*/
/** Ordered comparison. */
bool operator>= (UnsignedInteger <Bytes> const& other) const noexcept
{
return compare (other) >= 0;
}
/** Perform bitwise logical-not.
*/
/** Perform bitwise logical-not. */
UnsignedInteger <Bytes> operator~ () const noexcept
{
UnsignedInteger <Bytes> result;
@@ -298,8 +306,7 @@ public:
return result;
}
/** Perform bitwise logical-or.
*/
/** Perform bitwise logical-or. */
UnsignedInteger <Bytes>& operator|= (UnsignedInteger <Bytes> const& rhs) noexcept
{
for (int i = 0; i < Bytes; ++i)
@@ -308,8 +315,7 @@ public:
return *this;
}
/** Perform bitwise logical-or.
*/
/** Perform bitwise logical-or. */
UnsignedInteger <Bytes> operator| (UnsignedInteger <Bytes> const& rhs) const noexcept
{
UnsignedInteger <Bytes> result;
@@ -320,8 +326,7 @@ public:
return result;
}
/** Perform bitwise logical-and.
*/
/** Perform bitwise logical-and. */
UnsignedInteger <Bytes>& operator&= (UnsignedInteger <Bytes> const& rhs) noexcept
{
for (int i = 0; i < Bytes; ++i)
@@ -330,8 +335,7 @@ public:
return *this;
}
/** Perform bitwise logical-and.
*/
/** Perform bitwise logical-and. */
UnsignedInteger <Bytes> operator& (UnsignedInteger <Bytes> const& rhs) const noexcept
{
UnsignedInteger <Bytes> result;
@@ -342,8 +346,7 @@ public:
return result;
}
/** Perform bitwise logical-xor.
*/
/** Perform bitwise logical-xor. */
UnsignedInteger <Bytes>& operator^= (UnsignedInteger <Bytes> const& rhs) noexcept
{
for (int i = 0; i < Bytes; ++i)
@@ -352,8 +355,7 @@ public:
return *this;
}
/** Perform bitwise logical-xor.
*/
/** Perform bitwise logical-xor. */
UnsignedInteger <Bytes> operator^ (UnsignedInteger <Bytes> const& rhs) const noexcept
{
UnsignedInteger <Bytes> result;