diff options
author | Josh Blum | 2013-03-29 03:22:28 -0500 |
---|---|---|
committer | Josh Blum | 2013-03-29 03:22:28 -0500 |
commit | e78ac3e9582f46670a904f119d2ee80d7310b42e (patch) | |
tree | a24d20db2631c9d9e3d41642ee604228d5495e14 /python | |
parent | ca6d6b4a7786ecc3754532d85ed39da33684d5fc (diff) | |
parent | d6f413965cc91fd239f7ba587e9550233b386cc5 (diff) | |
download | sandhi-e78ac3e9582f46670a904f119d2ee80d7310b42e.tar.gz sandhi-e78ac3e9582f46670a904f119d2ee80d7310b42e.tar.bz2 sandhi-e78ac3e9582f46670a904f119d2ee80d7310b42e.zip |
Merge branch 'master' into query_work
Diffstat (limited to 'python')
-rw-r--r-- | python/gras/GRAS_Block.i | 3 | ||||
-rw-r--r-- | python/gras/GRAS_HierBlock.i | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/python/gras/GRAS_Block.i b/python/gras/GRAS_Block.i index b4d8293..84d6548 100644 --- a/python/gras/GRAS_Block.i +++ b/python/gras/GRAS_Block.i @@ -79,7 +79,8 @@ struct BlockPython : Block virtual ~BlockPython(void) { - //NOP + PyTSPhondler phil; + this->reset(); } void notify_active(void) diff --git a/python/gras/GRAS_HierBlock.i b/python/gras/GRAS_HierBlock.i index 12a5952..21d087e 100644 --- a/python/gras/GRAS_HierBlock.i +++ b/python/gras/GRAS_HierBlock.i @@ -45,7 +45,7 @@ struct TopBlockPython : TopBlock //NOP } - ~TopBlockPython(void) + virtual ~TopBlockPython(void) { PyTSPhondler phil; this->reset(); @@ -89,6 +89,12 @@ struct HierBlockPython : HierBlock { //NOP } + + virtual ~HierBlockPython(void) + { + PyTSPhondler phil; + this->reset(); + } }; } |