From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 18 Nov 2015 20:10:13 +0000 (-0500)
Subject: [4096] Merge branch 'master' into trac4096
X-Git-Tag: trac4097a_base~1^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=02f6c505d10fe5fe68f1e94fe40828ffc811468e;p=thirdparty%2Fkea.git

[4096] Merge branch 'master' into trac4096

    Eval library now supports actual parsing.  Need to use it
    in class definition's ExpressionParser.
---

02f6c505d10fe5fe68f1e94fe40828ffc811468e
diff --cc src/lib/dhcpsrv/client_class_def.h
index 78a65fee92,722fcfe22e..8534395c90
--- a/src/lib/dhcpsrv/client_class_def.h
+++ b/src/lib/dhcpsrv/client_class_def.h
@@@ -132,12 -111,9 +132,12 @@@ typedef boost::shared_ptr<ClientClassDe
  /// @brief Defines a map of ClientClassDef's, keyed by the class name.
  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 Maintains a list of ClientClassDef's
  class ClientClassDictionary {