From: Francis Dupont <fdupont@isc.org>
Date: Mon, 21 Nov 2016 05:40:39 +0000 (+0100)
Subject: [5014] Only fatal must be static
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=32da6dbbde68ed6901ed97a319fea296f08d975e;p=thirdparty%2Fkea.git

[5014] Only fatal must be static
---

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index b8605fa8aa..5bd7f8bcef 100644
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -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);
     
diff --git a/src/bin/dhcp6/parser_context.h b/src/bin/dhcp6/parser_context.h
index 73e3f2d9a9..ed895cd69e 100644
--- a/src/bin/dhcp6/parser_context.h
+++ b/src/bin/dhcp6/parser_context.h
@@ -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: