Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
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
6d0171d0
Commit
6d0171d0
authored
Nov 21, 2016
by
Francis Dupont
Committed by
Tomek Mrugalski
Nov 29, 2016
Browse files
[5014] Only fatal must be static
parent
b27c8429
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp6/dhcp6_lexer.ll
View file @
6d0171d0
...
...
@@ -147,7 +147,7 @@ JSONString \"{JSONStringCharacter}*\"
std::string tmp(yytext+1);
tmp.resize(tmp.size() - 1);
Parser6Context::
includeFile(tmp);
driver.
includeFile(tmp);
}
<DIR_EXIT>"
?
>
" BEGIN(INITIAL);
...
...
src/bin/dhcp6/parser_context.h
View file @
6d0171d0
...
...
@@ -63,7 +63,7 @@ public:
void
scanFileEnd
(
FILE
*
f
);
/// @brief Divert input to an include file.
static
void
includeFile
(
const
std
::
string
&
filename
);
void
includeFile
(
const
std
::
string
&
filename
);
/// @brief Run the parser on the string specified.
///
...
...
@@ -81,17 +81,18 @@ public:
///
/// @param loc location within the parsed file when experienced a problem.
/// @param what string explaining the nature of the error.
static
void
error
(
const
isc
::
dhcp
::
location
&
loc
,
const
std
::
string
&
what
);
void
error
(
const
isc
::
dhcp
::
location
&
loc
,
const
std
::
string
&
what
);
/// @brief Error handler
///
/// This is a simplified error reporting tool for possible future
/// cases when the EvalParser is not able to handle the packet.
static
void
error
(
const
std
::
string
&
what
);
void
error
(
const
std
::
string
&
what
);
/// @brief Fatal error handler
///
/// This is for should not happen but fatal errors
/// This is for should not happen but fatal errors.
/// Used by YY_FATAL_ERROR macro so required to be static.
static
void
fatal
(
const
std
::
string
&
what
);
private:
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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