Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
03f0b4d0
Commit
03f0b4d0
authored
Jul 16, 2012
by
Mukund Sivaraman
Browse files
Merge branch 'master' into trac2122_2
parents
1100d1a6
0969103b
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/lib/dns/messagerenderer.cc
View file @
03f0b4d0
...
...
@@ -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
()
:
...
...
src/lib/dns/name.cc
View file @
03f0b4d0
...
...
@@ -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
...
...
src/lib/util/tests/memory_segment_local_unittest.cc
View file @
03f0b4d0
...
...
@@ -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
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment