diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-05-16 17:30:13 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-05-20 16:52:30 -0400 |
| commit | f1e9c2f91b021b695afad733c44945b6c779bfd5 (patch) | |
| tree | f19c2598c8f20680f23cad67594e451269250ddf /src | |
| parent | 10bc76f38b5fa7d213f698fa7b8de14d20e40c07 (diff) | |
minor changes to language bindings
Diffstat (limited to 'src')
| -rw-r--r-- | src/cvc4.i | 4 | ||||
| -rw-r--r-- | src/expr/expr.i | 4 | ||||
| -rw-r--r-- | src/expr/type.i | 4 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/cvc4.i b/src/cvc4.i index 965452b84..386bd00b5 100644 --- a/src/cvc4.i +++ b/src/cvc4.i @@ -54,9 +54,11 @@ using namespace CVC4; #include "expr/expr.h" #include "util/datatype.h" #include "expr/command.h" -#include "bindings/java_stream_adapters.h" +#ifdef SWIGJAVA +#include "bindings/java_stream_adapters.h" std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters; +#endif %} %template(vectorCommandPtr) std::vector< CVC4::Command* >; diff --git a/src/expr/expr.i b/src/expr/expr.i index 977345a63..c649a5ebb 100644 --- a/src/expr/expr.i +++ b/src/expr/expr.i @@ -9,7 +9,11 @@ #endif /* SWIGJAVA */ %} +#ifdef SWIGPYTHON +%rename(doApply) CVC4::ExprHashFunction::operator()(CVC4::Expr) const; +#else /* SWIGPYTHON */ %rename(apply) CVC4::ExprHashFunction::operator()(CVC4::Expr) const; +#endif /* SWIGPYTHON */ %ignore CVC4::operator<<(std::ostream&, const Expr&); %ignore CVC4::operator<<(std::ostream&, const TypeCheckingException&); diff --git a/src/expr/type.i b/src/expr/type.i index e227cca23..6394dda67 100644 --- a/src/expr/type.i +++ b/src/expr/type.i @@ -2,7 +2,11 @@ #include "expr/type.h" %} +#ifdef SWIGPYTHON +%rename(doApply) CVC4::TypeHashFunction::operator()(const CVC4::Type&) const; +#else /* SWIGPYTHON */ %rename(apply) CVC4::TypeHashFunction::operator()(const CVC4::Type&) const; +#endif /* SWIGPYTHON */ %ignore CVC4::operator<<(std::ostream&, const Type&); |