diff options
| author | Morgan Deters <mdeters@gmail.com> | 2009-11-19 22:07:01 +0000 |
|---|---|---|
| committer | Morgan Deters <mdeters@gmail.com> | 2009-11-19 22:07:01 +0000 |
| commit | cd98370b338a0cc5343067151884a06431a1d92c (patch) | |
| tree | 7e61d8cf61ada9fef8f470a3c781a07a5df5a0fc /src/prop | |
| parent | 394791604a62e19763a8a45328bc5177d91fabf9 (diff) | |
testing framework, configure fixes, incorporations from meeting, continued work
Diffstat (limited to 'src/prop')
| -rw-r--r-- | src/prop/Makefile.am | 2 | ||||
| -rw-r--r-- | src/prop/minisat/Makefile.am | 1 | ||||
| -rw-r--r-- | src/prop/prop_engine.h | 10 | ||||
| -rw-r--r-- | src/prop/sat.h | 10 |
4 files changed, 14 insertions, 9 deletions
diff --git a/src/prop/Makefile.am b/src/prop/Makefile.am index 5051420a2..941b0c653 100644 --- a/src/prop/Makefile.am +++ b/src/prop/Makefile.am @@ -1,4 +1,4 @@ INCLUDES = -I@srcdir@/../include -I@srcdir@/.. -AM_CXXFLAGS = -Wall +AM_CXXFLAGS = -Wall -fvisibility=hidden SUBDIRS = minisat diff --git a/src/prop/minisat/Makefile.am b/src/prop/minisat/Makefile.am index 74d72d48d..97cfc438a 100644 --- a/src/prop/minisat/Makefile.am +++ b/src/prop/minisat/Makefile.am @@ -1,4 +1,5 @@ INCLUDES = -I@srcdir@/mtl -I@srcdir@/core -I@srcdir@/../../include +AM_CXXFLAGS = -Wall -fvisibility=hidden noinst_LIBRARIES = libminisat.a libminisat_a_SOURCES = \ diff --git a/src/prop/prop_engine.h b/src/prop/prop_engine.h index 0febd2927..5572b47f7 100644 --- a/src/prop/prop_engine.h +++ b/src/prop/prop_engine.h @@ -9,14 +9,15 @@ ** **/ -#ifndef __CVC4_PROP_ENGINE_H -#define __CVC4_PROP_ENGINE_H +#ifndef __CVC4__PROP__PROP_ENGINE_H +#define __CVC4__PROP__PROP_ENGINE_H #include "core/cvc4_expr.h" #include "core/decision_engine.h" #include "core/theory_engine.h" namespace CVC4 { +namespace prop { // In terms of abstraction, this is below (and provides services to) // Prover and above (and requires the services of) a specific @@ -38,6 +39,7 @@ public: };/* class PropEngine */ -} +}/* CVC4::prop namespace */ +}/* CVC4 namespace */ -#endif /* __CVC4_PROP_ENGINE_H */ +#endif /* __CVC4__PROP__PROP_ENGINE_H */ diff --git a/src/prop/sat.h b/src/prop/sat.h index 00a94c142..32ca9e983 100644 --- a/src/prop/sat.h +++ b/src/prop/sat.h @@ -9,11 +9,13 @@ ** **/ -#ifndef __CVC4_SAT_H -#define __CVC4_SAT_H +#ifndef __CVC4__PROP__SAT_H +#define __CVC4__PROP__SAT_H namespace CVC4 { +namespace prop { -} /* CVC4 namespace */ +}/* CVC4::prop namespace */ +}/* CVC4 namespace */ -#endif /* __CVC4_SAT_H */ +#endif /* __CVC4__PROP__SAT_H */ |