From: Tomek Mrugalski <tomasz@isc.org>
Date: Sat, 28 Jan 2017 10:32:20 +0000 (+0100)
Subject: [master] Merge branch 'trac5123'
X-Git-Tag: trac5126_base~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=656d42a5c66fc3b6cfed175d7e6654228ce19c9c;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5123'
---

656d42a5c66fc3b6cfed175d7e6654228ce19c9c
diff --cc src/lib/dhcpsrv/parsers/dhcp_parsers.h
index ac7bc403b6,7b2ec6c5b4..700864d9c8
--- a/src/lib/dhcpsrv/parsers/dhcp_parsers.h
+++ b/src/lib/dhcpsrv/parsers/dhcp_parsers.h
@@@ -932,15 -1028,20 +933,15 @@@ private
  
      /// @brief Returns a value converted to ReplaceClientNameMode
      ///
-     /// Instantiation of extractConvert() to ReplaceClientNameMode
+     /// Instantiation of getAndConvert() to ReplaceClientNameMode
      ///
-     /// @param value value of the parameter
+     /// @param scope specified parameter will be extracted from this scope
+     /// @param name name of the parameter
      /// @return a NameChangeFormat value
      D2ClientConfig::ReplaceClientNameMode
-     getMode(const std::string& name,
-             isc::data::ConstElementPtr value) const;
+     getMode(isc::data::ConstElementPtr scope, const std::string& name);
  };
  
 -// Pointers to various parser objects.
 -typedef boost::shared_ptr<BooleanParser> BooleanParserPtr;
 -typedef boost::shared_ptr<StringParser> StringParserPtr;
 -typedef boost::shared_ptr<Uint32Parser> Uint32ParserPtr;
 -
  }; // end of isc::dhcp namespace
  }; // end of isc namespace