From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 19 Nov 2015 11:57:57 +0000 (-0500)
Subject: [4096]  Pull in changes from Francis
X-Git-Tag: trac4097a_base~1^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60a518e7242bc1206f5db4ff0dfc6122c6d5016b;p=thirdparty%2Fkea.git

[4096]  Pull in changes from Francis

Merge branch 'trac4096' of ssh://git.kea.isc.org/git/kea into trac4096
---

60a518e7242bc1206f5db4ff0dfc6122c6d5016b
diff --cc src/lib/dhcpsrv/client_class_def.h
index 8534395c90,22e52deee1..843320c1d1
--- a/src/lib/dhcpsrv/client_class_def.h
+++ b/src/lib/dhcpsrv/client_class_def.h
@@@ -130,13 -130,13 +130,13 @@@ private
  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 ClientClassDictionary
 +/// @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 {