diff options
author | Tim King <taking@google.com> | 2015-12-30 11:45:37 -0800 |
---|---|---|
committer | Tim King <taking@google.com> | 2015-12-30 11:45:37 -0800 |
commit | fa7f30a4ba08afe066604daee87006b4fb5f21f7 (patch) | |
tree | 6eecac7cce64fa00f4ac5c18f023f1bc234435a3 /src/util | |
parent | 1ce397129214a427a10ff3e33069e315fe13eec1 (diff) |
Shuffling around public vs. private headers
- Adding a script contrib/test_install_headers.h that tests whether one can include all cvc4_public headers. CVC4 can pass this test after this commit.
- Making lib/{clock_gettime.h,ffs.h,strtok_r.h} cvc4_private.
- Making prop/sat_solver_factory.h cvc4_private.
- Moving the expr iostream manipulators into their own files: expr_iomanip.{h,cpp}.
- Setting the generated *_options.h files back to being cvc4_private.
-- Removing the usage of options/expr_options.h from expr.h.
-- Removing the include of base_options.h from options.h.
- Cleaning up CPP macros in cvc4_public headers.
-- Changing the ROLL macro in floatingpoint.h into an inline function.
-- Removing the now unused flag -D__BUILDING_STATISTICS_FOR_EXPORT.
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/floatingpoint.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/util/floatingpoint.h b/src/util/floatingpoint.h index 132d67b1c..d8a3a65d9 100644 --- a/src/util/floatingpoint.h +++ b/src/util/floatingpoint.h @@ -62,11 +62,11 @@ namespace CVC4 { }; /* class FloatingPointSize */ - - -#define ROLL(X,N) (((X) << (N)) | ((X) >> (8*sizeof((X)) - (N)) )) - struct CVC4_PUBLIC FloatingPointSizeHashFunction { + static inline size_t ROLL(size_t X, size_t N) { + return (((X) << (N)) | ((X) >> (8*sizeof((X)) - (N)) )); + } + inline size_t operator() (const FloatingPointSize& fpt) const { return size_t(ROLL(fpt.exponent(), 4*sizeof(unsigned)) | fpt.significand()); |