Some items from the CVC4 public interface review:

* rename DeclarationScope to SymbolTable
* rename all HashStrategy -> HashFunction (which we often have anyways)
* remove CDCircList (no one is currently using it)

1 files changed, 8 insertions, 6 deletions

diff --git a/src/expr/kind_template.h b/src/expr/kind_template.h
index 6313aa30b..1acbed978 100644
--- a/src/expr/kind_template.h
+++ b/src/expr/kind_template.h
@@ -87,9 +87,11 @@ inline std::string kindToString(::CVC4::Kind k) {
   return ss.str();
 }
 
-struct KindHashStrategy {
-  static inline size_t hash(::CVC4::Kind k) { return k; }
-};/* struct KindHashStrategy */
+struct KindHashFunction {
+  inline size_t operator()(::CVC4::Kind k) const {
+    return k;
+  }
+};/* struct KindHashFunction */
 
 }/* CVC4::kind namespace */
 
@@ -104,11 +106,11 @@ ${type_constant_list}
 /**
  * We hash the constants with their values.
  */
-struct TypeConstantHashStrategy {
-  static inline size_t hash(TypeConstant tc) {
+struct TypeConstantHashFunction {
+  inline size_t operator()(TypeConstant tc) const {
     return tc;
   }
-};/* struct BoolHashStrategy */
+};/* struct TypeConstantHashFunction */
 
 inline std::ostream& operator<<(std::ostream& out, TypeConstant typeConstant) {
   switch(typeConstant) {