[2429] some style fixes: return ref from proxy method; add 'u' to numeric val

diff --git a/src/lib/dns/rrttl.h b/src/lib/dns/rrttl.h
index ed512061d161be9a74fc1402a9cb188b21f0e0b5..e160a1e1a777840bc0d5ebf518a7d35aaae46a74 100644 (file)
--- a/src/lib/dns/rrttl.h
+++ b/src/lib/dns/rrttl.h
@@ -293,7 +293,7 @@ public:
     ///
     /// \note At the moment an RRTTL object can have a value larger than
     /// this limit.  We may revisit it in a future version.
-    static const RRTTL MAX() {
+    static const RRTTL& MAX() {
         static const RRTTL max_ttl(0x7fffffff);
         return (max_ttl);
     }

diff --git a/src/lib/dns/tests/rrttl_unittest.cc b/src/lib/dns/tests/rrttl_unittest.cc
index 4c0ff4ded6b4793160877f17fa1f621101a1cb8b..916f720e6a56c975517b5858881c0a2f651a6a1c 100644 (file)
--- a/src/lib/dns/tests/rrttl_unittest.cc
+++ b/src/lib/dns/tests/rrttl_unittest.cc
@@ -266,7 +266,7 @@ TEST_F(RRTTLTest, gthan) {
 }
 
 TEST_F(RRTTLTest, maxTTL) {
-    EXPECT_EQ((1 << 31) - 1, RRTTL::MAX().getValue());
+    EXPECT_EQ((1u << 31) - 1, RRTTL::MAX().getValue());
 }
 
 // test operator<<.  We simply confirm it appends the result of toText().