Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-daemon
Commits
b33fe51a
Commit
b33fe51a
authored
Apr 24, 2012
by
Tristan Matthews
Browse files
Merge branch 'master' into sipregistration
Resolved Conflicts: daemon/src/sip/sipvoiplink.cpp
parents
904f7882
f2762ba6
Changes
1
Hide whitespace changes
Inline
Side-by-side
daemon/src/config/yamlnode.cpp
View file @
b33fe51a
...
...
@@ -107,12 +107,10 @@ YamlNode *MappingNode::getValue(const std::string &key) const
{
Mapping
::
const_iterator
it
=
map_
.
find
(
key
);
if
(
it
!=
map_
.
end
())
{
if
(
it
!=
map_
.
end
())
return
it
->
second
;
}
else
{
DEBUG
(
"MappingNode: Could not find %s"
,
key
.
c_str
());
else
return
NULL
;
}
}
void
MappingNode
::
getValue
(
const
std
::
string
&
key
,
bool
*
b
)
const
...
...
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