From 42c39b6be38d1d5e0cd4ad635b986948f2cce3af Mon Sep 17 00:00:00 2001 From: Thomas Geymayer Date: Tue, 15 Oct 2013 00:49:13 +0200 Subject: [PATCH] Canvas: use new naGCSave/naGCRelease functions. --- simgear/canvas/CanvasEventListener.cxx | 5 ++--- simgear/canvas/CanvasSystemAdapter.hxx | 12 ------------ 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/simgear/canvas/CanvasEventListener.cxx b/simgear/canvas/CanvasEventListener.cxx index 03675ff7..5dcfab51 100644 --- a/simgear/canvas/CanvasEventListener.cxx +++ b/simgear/canvas/CanvasEventListener.cxx @@ -43,14 +43,13 @@ namespace canvas "canvas::NasalEventListener: invalid function argument" ); - _gc_key = sys_adapter->gcSave(_code); + _gc_key = naGCSave(_code); } //---------------------------------------------------------------------------- NasalEventListener::~NasalEventListener() { - if( !_sys.expired() ) - _sys.lock()->gcRelease(_gc_key); + naGCRelease(_gc_key); } //---------------------------------------------------------------------------- diff --git a/simgear/canvas/CanvasSystemAdapter.hxx b/simgear/canvas/CanvasSystemAdapter.hxx index a2bb1fe2..6a250f4d 100644 --- a/simgear/canvas/CanvasSystemAdapter.hxx +++ b/simgear/canvas/CanvasSystemAdapter.hxx @@ -39,18 +39,6 @@ namespace canvas virtual naContext getNasalContext() const = 0; - /** - * Save passed reference to Nasal object from being deleted by the - * garbage collector. - */ - virtual int gcSave(naRef r) = 0; - - /** - * Release an object previously passed to ::gcSave to allow it being - * cleaned up by the garbage collector. - */ - virtual void gcRelease(int key) = 0; - /** * Call a Nasal function with the given environment and arguments. */ -- 2.39.5