diff options
author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-06-27 15:35:24 -0400 |
---|---|---|
committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-06-27 16:46:22 -0400 |
commit | 38a13fe227e6b59a49509d4b5ae6618b4c14937a (patch) | |
tree | e81fb31b46ffc1e948c48d647ca7d2bc2467a211 /src/util | |
parent | e6f4f9fbd3e2e3471f0df46959e3924368f31bdb (diff) |
Remove output.h from public space, to avoid clashes with symbols defined in users' space.
Specifically, output.h was moved to CVC4's "private-library" rules, which means that it's
not installed on users' machines, and public headers should not include it.
Thanks to Alex Horn for raising the issue on the CVC-BUGS mailing list.
Diffstat (limited to 'src/util')
-rw-r--r-- | src/util/datatype.h | 1 | ||||
-rw-r--r-- | src/util/dump.h | 1 | ||||
-rw-r--r-- | src/util/output.h | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/util/datatype.h b/src/util/datatype.h index 3da441f1f..c46c10c97 100644 --- a/src/util/datatype.h +++ b/src/util/datatype.h @@ -33,7 +33,6 @@ namespace CVC4 { #include "expr/expr.h" #include "expr/type.h" -#include "util/output.h" #include "util/hash.h" #include "util/exception.h" diff --git a/src/util/dump.h b/src/util/dump.h index 2ef6010e3..0bde68d76 100644 --- a/src/util/dump.h +++ b/src/util/dump.h @@ -19,7 +19,6 @@ #ifndef __CVC4__DUMP_H #define __CVC4__DUMP_H -#include "util/output.h" #include "expr/command.h" namespace CVC4 { diff --git a/src/util/output.h b/src/util/output.h index 263d5a144..7394f24ab 100644 --- a/src/util/output.h +++ b/src/util/output.h @@ -14,7 +14,7 @@ ** Output utility classes and functions. **/ -#include "cvc4_public.h" +#include "cvc4_private_library.h" #ifndef __CVC4__OUTPUT_H #define __CVC4__OUTPUT_H |