Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Change clear() to return Hash & instead of Hash * hash
authorPeter D. Barnes, Jr. <barnes26@llnl.gov>
Tue, 13 Nov 2012 16:35:51 -0800
branchhash
changeset 9931 a3edc13a84f3
parent 9930 0268fa8576c0
child 9932 0fd1bdf7671f
Change clear() to return Hash & instead of Hash *
src/core/model/hash.cc file | annotate | diff | comparison | revisions
src/core/model/hash.h file | annotate | diff | comparison | revisions
src/core/test/hash-test-suite.cc file | annotate | diff | comparison | revisions
src/lte/model/lte-radio-bearer-tag.cc file | annotate | diff | comparison | revisions
src/lte/model/lte-radio-bearer-tag.h file | annotate | diff | comparison | revisions
src/lte/model/lte-rlc-um.cc file | annotate | diff | comparison | revisions
src/lte/model/lte-rlc-um.h file | annotate | diff | comparison | revisions 
--- a/src/core/model/hash.cc	Tue Nov 13 16:35:21 2012 -0800
+++ b/src/core/model/hash.cc	Tue Nov 13 16:35:51 2012 -0800
@@ -42,11 +42,11 @@
   NS_ASSERT (m_impl != 0);
 }
 
-Hash *
+Hash &
 Hash::clear (void)
 {
   m_impl->clear();
-  return this;
+  return *this;
 }
 
 } // namespace ns3
--- a/src/core/model/hash.h	Tue Nov 13 16:35:21 2012 -0800
+++ b/src/core/model/hash.h	Tue Nov 13 16:35:51 2012 -0800
@@ -109,7 +109,7 @@
    *
    * \return this
    */
-  Hash * clear (void);
+  Hash & clear (void);
   
 private:
   Ptr<HashImplementation> m_impl;    /** Hash implementation */
--- a/src/core/test/hash-test-suite.cc	Tue Nov 13 16:35:21 2012 -0800
+++ b/src/core/test/hash-test-suite.cc	Tue Nov 13 16:35:51 2012 -0800
@@ -98,14 +98,14 @@
   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 @@
   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
ns-3.24