diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-04 00:50:57 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-04 00:51:01 -0500 |
| commit | f44697212a001ddc0fded4f72037faa3da531ea4 (patch) | |
| tree | 421a92ae773c6ee299123f7fc066614982d297b5 | |
| parent | 2d14fc1cced2a2404e0928168b4ed633aeea2815 (diff) | |
More Java bindings fixes
| -rw-r--r-- | src/cvc4.i | 3 | ||||
| -rw-r--r-- | src/util/regexp.i | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/cvc4.i b/src/cvc4.i index 52c4f4ea7..ec3aa43cb 100644 --- a/src/cvc4.i +++ b/src/cvc4.i @@ -64,6 +64,7 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters; %template(vectorCommandPtr) std::vector< CVC4::Command* >; %template(vectorType) std::vector< CVC4::Type >; %template(vectorExpr) std::vector< CVC4::Expr >; +%template(vectorUnsignedInt) std::vector< unsigned int >; %template(vectorVectorExpr) std::vector< std::vector< CVC4::Expr > >; %template(vectorDatatypeType) std::vector< CVC4::DatatypeType >; %template(vectorSExpr) std::vector< CVC4::SExpr >; @@ -247,10 +248,10 @@ std::set<JavaInputStreamAdapter*> CVC4::JavaInputStreamAdapter::s_adapters; %include "util/rational.i" %include "util/exception.i" %include "util/language.i" -%include "options/options.i" %include "util/cardinality.i" %include "util/bool.i" %include "util/sexpr.i" +%include "options/options.i" %include "util/statistics.i" %include "util/result.i" %include "util/configuration.i" diff --git a/src/util/regexp.i b/src/util/regexp.i index 60765391d..9f9826663 100644 --- a/src/util/regexp.i +++ b/src/util/regexp.i @@ -30,4 +30,6 @@ %ignore CVC4::operator<<(std::ostream&, const String&); %ignore CVC4::operator<<(std::ostream&, const RegExp&); +%apply int &OUTPUT { int &c }; %include "util/regexp.h" +%clear int &c; |