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/lib | |
| 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/lib')
| -rw-r--r-- | src/lib/clock_gettime.h | 2 | ||||
| -rw-r--r-- | src/lib/ffs.h | 5 | ||||
| -rw-r--r-- | src/lib/strtok_r.h | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/clock_gettime.h b/src/lib/clock_gettime.h index e065466f2..daae9aabf 100644 --- a/src/lib/clock_gettime.h +++ b/src/lib/clock_gettime.h @@ -14,7 +14,7 @@ ** Replacement for clock_gettime() for systems without it (like Mac OS X). **/ -#include "cvc4_public.h" +#include "cvc4_private.h" #ifndef __CVC4__LIB__CLOCK_GETTIME_H #define __CVC4__LIB__CLOCK_GETTIME_H diff --git a/src/lib/ffs.h b/src/lib/ffs.h index 2dc51d0e9..44fb40674 100644 --- a/src/lib/ffs.h +++ b/src/lib/ffs.h @@ -14,11 +14,14 @@ ** Replacement for ffs() for systems without it (like Win32). **/ -#include "cvc4_public.h" +#include "cvc4_private.h" #ifndef __CVC4__LIB__FFS_H #define __CVC4__LIB__FFS_H +//We include this for HAVE_FFS +#include "cvc4autoconfig.h" + #ifdef HAVE_FFS // available in strings.h diff --git a/src/lib/strtok_r.h b/src/lib/strtok_r.h index 644ff7a31..cc737043b 100644 --- a/src/lib/strtok_r.h +++ b/src/lib/strtok_r.h @@ -14,7 +14,7 @@ ** Replacement for strtok_r() for systems without it (like Win32). **/ -#include "cvc4_public.h" +#include "cvc4_private.h" #ifndef __CVC4__LIB__STRTOK_R_H #define __CVC4__LIB__STRTOK_R_H |