From 49ff349b67c7fed35782bf6407242fe58ef654c7 Mon Sep 17 00:00:00 2001 From: Gökçen Eraslan Date: Sun, 24 Jan 2016 13:18:24 +0100 Subject: bindings: Fix DataManager ownership problems using DISOWN. --- bindings/quackle.i | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) (limited to 'bindings/quackle.i') diff --git a/bindings/quackle.i b/bindings/quackle.i index cc8e390..e45eb88 100644 --- a/bindings/quackle.i +++ b/bindings/quackle.i @@ -37,21 +37,23 @@ #include "quackleio/gcgio.h" %} + %include "std_string.i" %include "std_vector.i" +%include "typemaps.i" + +%include "fixedstring.h" +%include "uv.h" +%include "alphabetparameters.h" /*Needed to generate proper iterable types */ %template(MoveVector) std::vector; %template(PlayerVector) std::vector; %template(ProbableRackList) std::vector; %template(PositionList) std::vector; - -%include "fixedstring.h" -%include "uv.h" -%include "alphabetparameters.h" - %template(LetterParameterVector) std::vector; %template(LetterStringVector) std::vector; + %include "move.h" %include "rack.h" %include "bag.h" @@ -61,10 +63,6 @@ %include "catchall.h" %include "player.h" -/* handle output arguments of PlayerList methods using cool SWIG typemaps */ -/* what we do here is just to tell SWIG that last bool& argument is an output argument */ -%include "typemaps.i" - using namespace std; namespace Quackle { @@ -83,6 +81,15 @@ namespace Quackle %include "sim.h" %include "computerplayer.h" %include "computerplayercollection.h" + +%apply SWIGTYPE *DISOWN {Quackle::AlphabetParameters *alphabetParameters}; +%apply SWIGTYPE *DISOWN {Quackle::BoardParameters *boardParameters}; +%apply SWIGTYPE *DISOWN {Quackle::StrategyParameters *lexiconParameters}; +%apply SWIGTYPE *DISOWN {Quackle::LexiconParameters *lexiconParameters}; +%apply SWIGTYPE *DISOWN {Quackle::Evaluator *evaluator}; +%apply SWIGTYPE *DISOWN {Quackle::GameParameters *parameters}; +%apply SWIGTYPE *DISOWN {const Quackle::PlayerList &playerList}; + %include "datamanager.h" %include "endgame.h" %include "endgameplayer.h" -- cgit v1.2.3