This commit is a merge from the "betterstats" branch, which:

* Makes Options an "omnipresent thread-local global" (like the notion
  of the "current NodeManager" was already).  Options::current() accesses
  this structure.
* Removes Options from constructors and data structures everywhere
  (this cleans up a lot of things).
* No longer uses StatisticsRegistry statically.  An instance of the
  registry is created and linked to a NodeManager.
* StatisticsRegistry::current() is similar to Options::current(), but
  the pointer is stowed in the NodeManager (rather than stored)
* The static functions of StatisticsRegistry have been left, for backward
  compatibility; they now use the "current" statistics registry.
* SmtEngine::getStatisticsRegistry() is a public accessor for the
  registry; this is needed by main() to reach in and get the registry,
  for flushing statistics at the end.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/expr/declaration_scope.h b/src/expr/declaration_scope.h
index 9acc46b5f..17140c850 100644
--- a/src/expr/declaration_scope.h
+++ b/src/expr/declaration_scope.h
@@ -77,7 +77,7 @@ public:
    * @param name an identifier
    * @param obj the expression to bind to <code>name</code>
    */
-  void bind(const std::string& name, Expr obj) throw();
+  void bind(const std::string& name, Expr obj) throw(AssertionException);
 
   /**
    * Bind a function body to a name in the current scope.  If
@@ -90,7 +90,7 @@ public:
    * @param name an identifier
    * @param obj the expression to bind to <code>name</code>
    */
-  void bindDefinedFunction(const std::string& name, Expr obj) throw();
+  void bindDefinedFunction(const std::string& name, Expr obj) throw(AssertionException);
 
   /**
    * Bind a type to a name in the current scope.  If <code>name</code>