F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change clear() to return Hash & instead of Hash *

Browse Source
This commit is contained in:
Peter D. Barnes, Jr.
2012-11-13 16:35:51 -08:00
parent 674f613678
commit 00ae7f99a0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/model/hash.cc
View File

@@ -42,11 +42,11 @@ Hash::Hash (Ptr<HashImplementation> hp)
NS_ASSERT (m_impl != 0);
}
Hash *
Hash &
Hash::clear (void)
{
m_impl->clear();
return this;
return *this;
}
} // namespace ns3

2
src/core/model/hash.h
View File

@@ -109,7 +109,7 @@ public:
*
* \return this
*/
Hash * clear (void);
Hash & clear (void);
private:
Ptr<HashImplementation> m_impl; /** Hash implementation */

8
src/core/test/hash-test-suite.cc
View File

@@ -98,14 +98,14 @@ HashFnv1aTestCase::DoRun (void)
Hash hasher = Hash ( Create<HashFunction::Fnv1a> () );
uint32_t h32r = 0x5735855b; // FNV1A(key)
uint32_t h32 = hasher.GetHash32 (key);
uint32_t h32 = hasher.clear ().GetHash32 (key);
NS_TEST_ASSERT_MSG_EQ (h32, h32r,
"Hash32 produced " << std::hex << std::setw ( 8) << h32
<< ", expected " << std::hex << std::setw ( 8) << h32r
);
uint64_t h64r = 0x6fb0aea4ad83c27b;
uint64_t h64 = hasher.GetHash64 (key);
uint64_t h64 = hasher.clear ().GetHash64 (key);
NS_TEST_ASSERT_MSG_EQ (h64, h64r,
"Hash64 produced " << std::hex << std::setw (16) << h64
<< ", expected " << std::hex << std::setw (16) << h64r
@@ -142,14 +142,14 @@ HashMurmur3TestCase::DoRun (void)
Hash hasher = Hash ( Create<HashFunction::Murmur3> () );
uint32_t h32r = 0xe8a2d100; // Murmur3(key)
uint32_t h32 = hasher.GetHash32 (key);
uint32_t h32 = hasher.clear ().GetHash32 (key);
NS_TEST_ASSERT_MSG_EQ (h32, h32r,
"Hash32 produced " << std::hex << std::setw ( 8) << h32
<< ", expected " << std::hex << std::setw ( 8) << h32r
);
uint64_t h64r = 0x95373d091a691071;
uint64_t h64 = hasher.GetHash64 (key);
uint64_t h64 = hasher.clear ().GetHash64 (key);
NS_TEST_ASSERT_MSG_EQ (h64, h64r,
"Hash64 produced " << std::hex << std::setw (16) << h64
<< ", expected " << std::hex << std::setw (16) << h64r