Commit 60a518e7 authored by Thomas Markwalder's avatar Thomas Markwalder
Browse files

[4096] Pull in changes from Francis

Merge branch 'trac4096' of ssh://git.kea.isc.org/git/kea into trac4096
parents 02f6c505 7911ff6e
......@@ -3944,7 +3944,7 @@ TEST_F(Dhcp4ParserTest, validClientClassDictionary) {
}
// Verifies that a class list containing an invalid
// class definition causes a configuraiton error.
// class definition causes a configuration error.
TEST_F(Dhcp4ParserTest, invalidClientClassDictionary) {
string config = "{ " + genIfaceConfig() + "," +
"\"valid-lifetime\": 4000, \n"
......
......@@ -4042,7 +4042,7 @@ TEST_F(Dhcp6ParserTest, validClientClassDictionary) {
}
// Verifies that a class list containing an invalid
// class definition causes a configuraiton error.
// class definition causes a configuration error.
TEST_F(Dhcp6ParserTest, invalidClientClassDictionary) {
string config = "{ " + genIfaceConfig() + "," +
"\"valid-lifetime\": 4000, \n"
......
......@@ -46,7 +46,7 @@ public:
/// @brief Embodies a single client class definition
class ClientClassDef {
public:
public:
/// @brief Constructor
///
/// @param name Name to assign to this class
......@@ -114,7 +114,7 @@ class ClientClassDef {
/// @brief Provides a convenient text representation of the class
friend std::ostream& operator<<(std::ostream& os, const ClientClassDef& x);
private:
private:
/// @brief Unique text identifier by which this class is known.
std::string name_;
......@@ -130,18 +130,18 @@ class ClientClassDef {
typedef boost::shared_ptr<ClientClassDef> ClientClassDefPtr;
/// @brief Defines a map of ClientClassDef's, keyed by the class name.
typedef std::map<std::string,ClientClassDefPtr> ClientClassDefMap;
typedef std::map<std::string, ClientClassDefPtr> ClientClassDefMap;
/// @brief Defines a pointer to a ClientClassDefMap
typedef boost::shared_ptr<ClientClassDefMap> ClientClassDefMapPtr;
/// @brief Defines a pair for working wiht ClientClassMap
typedef std::pair<std::string,ClientClassDefPtr> ClientClassMapPair;
/// @brief Defines a pair for working with ClientClassMap
typedef std::pair<std::string, ClientClassDefPtr> ClientClassMapPair;
/// @brief Maintains a list of ClientClassDef's
class ClientClassDictionary {
public:
public:
/// @brief Constructor
ClientClassDictionary();
......@@ -216,7 +216,7 @@ class ClientClassDictionary {
return (!equals(other));
}
private:
private:
/// @brief Map of the class definitions
ClientClassDefMapPtr classes_;
......
......@@ -44,7 +44,7 @@ protected:
/// occur.
/// @return Returns a pointer to class instance created, or NULL if
/// for some unforeseen reason it wasn't created in the local dictionary
/// @throw indirectly, execptions convertring the JSON text to elements,
/// @throw indirectly, exceptions convertring the JSON text to elements,
/// or by the parsing itself are not caught
ClientClassDefPtr parseClientClassDef(const std::string& config,
Option::Universe universe) {
......
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