diff options
| author | Tim King <taking@google.com> | 2016-01-08 16:44:57 -0800 |
|---|---|---|
| committer | Tim King <taking@google.com> | 2016-01-08 16:44:57 -0800 |
| commit | f4ef7af0a2295691f281ee1604dfeb4082fe229c (patch) | |
| tree | 995e512e5669cec6bbc9447d00ec912d5e4c19e3 /src/expr/Makefile.am | |
| parent | def0a07f9676a292a849d7fc8269ffd0901ce156 (diff) | |
Removing StatisticsRegistry's static functions current() and registerStat().
- The functionality the get the StatisticsRegistry attached to the SmtEngine was previously through StatisticsRegistry::current(). This is the dominant StatisticsRegistry in the code. (There is another StatisticsRegistry attached to the NodeManager.) Having this be a static function on StatisticsRegistry requires the use of an SmtEngine in the wrong compilation unit.
- Usages of StatisticsRegistry::current() that were visible in prop/{bvminisat,minisat} has been removed. A pointer to the relevant StatisticsRegistry should be passed instead into the constructor.
- The function StatisticsRegistry::current() has been replaced by SmtScope::currentStatisticsRegistry(). SmtScope is in the libcvc4 package, where SmtEngine is available in the compilation unit.
- The function smtStatisticsRegistry() is a synonym for SmtScope::currentStatisticsRegistry() in smt/smt_statistics_registry.h. This header has fewer include dependencies than the one for SmtScope.
- Correspondingly, the static functions StatisticsRegistry::{registerStat, unregisterStat} have been removed. One should instead use smtStatisticsRegistry()->{registerStat,unregisterStat} instead.
- The KEEP_STATISTIC macro has been moved into smt/smt_statistics_registry.h.
- Documents the reason StatisticsRegistry is CVC4_PUBLIC. This lets me remove the warning I added.
- Removing most operators for timespec from statistics_registry.h file. These a bit error prone in clang.
- Most of the really confusing ifdef's in util/statistics_registry.h are gone.
Diffstat (limited to 'src/expr/Makefile.am')
| -rw-r--r-- | src/expr/Makefile.am | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/src/expr/Makefile.am b/src/expr/Makefile.am index 5c046c282..4648ed3af 100644 --- a/src/expr/Makefile.am +++ b/src/expr/Makefile.am @@ -3,23 +3,10 @@ AM_CPPFLAGS = \ -I@builddir@/.. -I@srcdir@/../include -I@srcdir@/.. AM_CXXFLAGS = -Wall -Wno-unknown-pragmas $(FLAG_VISIBILITY_HIDDEN) -#noinst_LTLIBRARIES = libexpr.la libstatistics.la noinst_LTLIBRARIES = libexpr.la -# libstatistics_la_CPPFLAGS = $(CPPFLAGS) $(AM_CPPFLAGS) -D__BUILDING_STATISTICS_FOR_EXPORT -# libstatistics_la_SOURCES = \ -# statistics_registry.h \ -# statistics_registry.cpp - -# EXTRA_libstatistics_la_DEPENDENCIES = \ -# builts - # For some reason statistics were in libutil. No idea why though. libexpr_la_SOURCES = \ - statistics.cpp \ - statistics.h \ - statistics_registry.cpp \ - statistics_registry.h \ array.h \ array_store_all.cpp \ array_store_all.h \ @@ -102,7 +89,6 @@ EXTRA_DIST = \ expr_stream.i \ expr_manager.i \ symbol_table.i \ - statistics.i \ type.i \ kind.i \ expr.i \ |