From: Francis Dupont <fdupont@isc.org>
Date: Mon, 18 Dec 2017 09:09:13 +0000 (+0100)
Subject: [master] Finishing merge of trac5389 (Fedora / gcc 7)
X-Git-Tag: trac5404_base~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3388cd48e09cd0b9e14e6627801502ec43934338;p=thirdparty%2Fkea.git

[master] Finishing merge of trac5389 (Fedora / gcc 7)
---

3388cd48e09cd0b9e14e6627801502ec43934338
diff --cc src/bin/dhcp4/dhcp4_lexer.cc
index 54334ed8ee,3af22c061b..957a0be32d
--- a/src/bin/dhcp4/dhcp4_lexer.cc
+++ b/src/bin/dhcp4/dhcp4_lexer.cc
@@@ -3900,37 -3899,37 +3901,44 @@@ YY_RULE_SETU
  	YY_BREAK
  case 144:
  YY_RULE_SETUP
 -#line 1526 "dhcp4_lexer.ll"
++
 +#line 1527 "dhcp4_lexer.ll"
  { return isc::dhcp::Dhcp4Parser::make_LSQUARE_BRACKET(driver.loc_); }
  	YY_BREAK
  case 145:
  YY_RULE_SETUP
 -#line 1527 "dhcp4_lexer.ll"
++
 +#line 1528 "dhcp4_lexer.ll"
  { return isc::dhcp::Dhcp4Parser::make_RSQUARE_BRACKET(driver.loc_); }
  	YY_BREAK
  case 146:
  YY_RULE_SETUP
 -#line 1528 "dhcp4_lexer.ll"
++
 +#line 1529 "dhcp4_lexer.ll"
  { return isc::dhcp::Dhcp4Parser::make_LCURLY_BRACKET(driver.loc_); }
  	YY_BREAK
  case 147:
  YY_RULE_SETUP
 -#line 1529 "dhcp4_lexer.ll"
++
 +#line 1530 "dhcp4_lexer.ll"
  { return isc::dhcp::Dhcp4Parser::make_RCURLY_BRACKET(driver.loc_); }
  	YY_BREAK
  case 148:
  YY_RULE_SETUP
 -#line 1530 "dhcp4_lexer.ll"
++
 +#line 1531 "dhcp4_lexer.ll"
  { return isc::dhcp::Dhcp4Parser::make_COMMA(driver.loc_); }
  	YY_BREAK
  case 149:
  YY_RULE_SETUP
 -#line 1531 "dhcp4_lexer.ll"
++
 +#line 1532 "dhcp4_lexer.ll"
  { return isc::dhcp::Dhcp4Parser::make_COLON(driver.loc_); }
  	YY_BREAK
  case 150:
  YY_RULE_SETUP
 -#line 1533 "dhcp4_lexer.ll"
++
 +#line 1534 "dhcp4_lexer.ll"
  {
      /* An integer was found. */
      std::string tmp(yytext);
@@@ -3951,7 -3950,7 +3959,8 @@@
  	YY_BREAK
  case 151:
  YY_RULE_SETUP
 -#line 1551 "dhcp4_lexer.ll"
++
 +#line 1552 "dhcp4_lexer.ll"
  {
      /* A floating point was found. */
      std::string tmp(yytext);
@@@ -3967,7 -3966,7 +3976,8 @@@
  	YY_BREAK
  case 152:
  YY_RULE_SETUP
 -#line 1564 "dhcp4_lexer.ll"
++
 +#line 1565 "dhcp4_lexer.ll"
  {
      string tmp(yytext);
      return isc::dhcp::Dhcp4Parser::make_BOOLEAN(tmp == "true", driver.loc_);
@@@ -3975,29 -3974,29 +3985,34 @@@
  	YY_BREAK
  case 153:
  YY_RULE_SETUP
 -#line 1569 "dhcp4_lexer.ll"
++
 +#line 1570 "dhcp4_lexer.ll"
  {
     return isc::dhcp::Dhcp4Parser::make_NULL_TYPE(driver.loc_);
  }
  	YY_BREAK
  case 154:
  YY_RULE_SETUP
 -#line 1573 "dhcp4_lexer.ll"
++
 +#line 1574 "dhcp4_lexer.ll"
  driver.error (driver.loc_, "JSON true reserved keyword is lower case only");
  	YY_BREAK
  case 155:
  YY_RULE_SETUP
 -#line 1575 "dhcp4_lexer.ll"
++
 +#line 1576 "dhcp4_lexer.ll"
  driver.error (driver.loc_, "JSON false reserved keyword is lower case only");
  	YY_BREAK
  case 156:
  YY_RULE_SETUP
 -#line 1577 "dhcp4_lexer.ll"
++
 +#line 1578 "dhcp4_lexer.ll"
  driver.error (driver.loc_, "JSON null reserved keyword is lower case only");
  	YY_BREAK
  case 157:
  YY_RULE_SETUP
 -#line 1579 "dhcp4_lexer.ll"
++
 +#line 1580 "dhcp4_lexer.ll"
  driver.error (driver.loc_, "Invalid character: " + std::string(yytext));
  	YY_BREAK
  case YY_STATE_EOF(INITIAL):
@@@ -4027,10 -4026,10 +4042,11 @@@
  	YY_BREAK
  case 158:
  YY_RULE_SETUP
 -#line 1604 "dhcp4_lexer.ll"
++
 +#line 1605 "dhcp4_lexer.ll"
  ECHO;
  	YY_BREAK
 -#line 4032 "dhcp4_lexer.cc"
 +#line 4033 "dhcp4_lexer.cc"
  
  	case YY_END_OF_BUFFER:
  		{
@@@ -5135,7 -5134,7 +5151,8 @@@ void yyfree (void * ptr 
  
  /* %ok-for-header */
  
 -#line 1604 "dhcp4_lexer.ll"
++
 +#line 1605 "dhcp4_lexer.ll"
  
  
  using namespace isc::dhcp;
diff --cc src/lib/process/Makefile.am
index c7746c6963,7119fc443d..7ac81a2fec
--- a/src/lib/process/Makefile.am
+++ b/src/lib/process/Makefile.am
@@@ -33,11 -30,8 +30,11 @@@ BUILT_SOURCES = process_messages.h proc
  EXTRA_DIST = process_messages.mes libprocess.dox
  
  # Get rid of generated message files on a clean
- CLEANFILES = *.gcno *.gcda spec_config.h process_messages.h process_messages.cc s-messages
+ CLEANFILES = *.gcno *.gcda process_messages.h process_messages.cc s-messages
  
 +# Generated by configure files
 +DISTCLEANFILES = spec_config.h.pre
 +
  lib_LTLIBRARIES = libkea-process.la
  libkea_process_la_SOURCES  = d_cfg_mgr.cc d_cfg_mgr.h
  libkea_process_la_SOURCES += d_controller.cc d_controller.h