diff options
| author | Mukund Sivaraman <muks@isc.org> | 2012-07-15 22:50:54 +0200 |
|---|---|---|
| committer | Mukund Sivaraman <muks@isc.org> | 2012-07-15 22:50:54 +0200 |
| commit | 03f0b4d031e117cfd5ed21bcb43b4c1375c732bf (patch) | |
| tree | 00f71dc564844b70b86a22732345912d6a6dee6d | |
| parent | [2122] Add isc.sysinfo.SysInfo implementation for FreeBSD (squashed commit) (diff) | |
| parent | [master] Use a temporary variable in Name::compare() (diff) | |
| download | kea-03f0b4d031e117cfd5ed21bcb43b4c1375c732bf.tar.xz kea-03f0b4d031e117cfd5ed21bcb43b4c1375c732bf.zip | |
Merge branch 'master' into trac2122_2
| -rw-r--r-- | src/lib/dns/messagerenderer.cc | 3 | ||||
| -rw-r--r-- | src/lib/dns/name.cc | 3 | ||||
| -rw-r--r-- | src/lib/util/tests/memory_segment_local_unittest.cc | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/dns/messagerenderer.cc b/src/lib/dns/messagerenderer.cc index 081a5aa6d7..0cd11cef5a 100644 --- a/src/lib/dns/messagerenderer.cc +++ b/src/lib/dns/messagerenderer.cc @@ -364,7 +364,8 @@ MessageRenderer::writeName(const LabelSequence& ls, const bool compress) { void MessageRenderer::writeName(const Name& name, const bool compress) { - writeName(LabelSequence(name), compress); + const LabelSequence ls(name); + writeName(ls, compress); } AbstractMessageRenderer::AbstractMessageRenderer() : diff --git a/src/lib/dns/name.cc b/src/lib/dns/name.cc index c6f0c23782..bd24bda677 100644 --- a/src/lib/dns/name.cc +++ b/src/lib/dns/name.cc @@ -435,7 +435,8 @@ Name::toText(bool omit_final_dot) const { NameComparisonResult Name::compare(const Name& other) const { - return LabelSequence(*this).compare(LabelSequence(other)); + LabelSequence ls(*this); + return (ls.compare(LabelSequence(other))); } bool diff --git a/src/lib/util/tests/memory_segment_local_unittest.cc b/src/lib/util/tests/memory_segment_local_unittest.cc index a18a9b2c0d..64b7292425 100644 --- a/src/lib/util/tests/memory_segment_local_unittest.cc +++ b/src/lib/util/tests/memory_segment_local_unittest.cc @@ -16,6 +16,7 @@ #include <exceptions/exceptions.h> #include <gtest/gtest.h> #include <memory> +#include <limits.h> using namespace std; using namespace isc::util; @@ -56,7 +57,7 @@ TEST(MemorySegmentLocal, TestLocal) { TEST(MemorySegmentLocal, TestTooMuchMemory) { auto_ptr<MemorySegment> segment(new MemorySegmentLocal()); - EXPECT_THROW(segment->allocate(0x7fffffffffffffff), bad_alloc); + EXPECT_THROW(segment->allocate(ULONG_MAX), bad_alloc); } TEST(MemorySegmentLocal, TestBadDeallocate) { |