Commit 6d0171d0 authored by Francis Dupont's avatar Francis Dupont Committed by Tomek Mrugalski
Browse files

[5014] Only fatal must be static

parent b27c8429
...@@ -147,7 +147,7 @@ JSONString \"{JSONStringCharacter}*\" ...@@ -147,7 +147,7 @@ JSONString \"{JSONStringCharacter}*\"
std::string tmp(yytext+1); std::string tmp(yytext+1);
tmp.resize(tmp.size() - 1); tmp.resize(tmp.size() - 1);
Parser6Context::includeFile(tmp); driver.includeFile(tmp);
} }
<DIR_EXIT>"?>" BEGIN(INITIAL); <DIR_EXIT>"?>" BEGIN(INITIAL);
......
...@@ -63,7 +63,7 @@ public: ...@@ -63,7 +63,7 @@ public:
void scanFileEnd(FILE * f); void scanFileEnd(FILE * f);
/// @brief Divert input to an include file. /// @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. /// @brief Run the parser on the string specified.
/// ///
...@@ -81,17 +81,18 @@ public: ...@@ -81,17 +81,18 @@ public:
/// ///
/// @param loc location within the parsed file when experienced a problem. /// @param loc location within the parsed file when experienced a problem.
/// @param what string explaining the nature of the error. /// @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 /// @brief Error handler
/// ///
/// This is a simplified error reporting tool for possible future /// This is a simplified error reporting tool for possible future
/// cases when the EvalParser is not able to handle the packet. /// 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 /// @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); static void fatal(const std::string& what);
private: private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment