From a64f9e671936451d7a3a60191dcca6e37e97e585 Mon Sep 17 00:00:00 2001
From: Tavian Barnes <tavianator@gmail.com>
Date: Thu, 9 Jul 2009 21:03:16 +0000
Subject: Implement removing/inserting in the middle of a dmnsn_array*.

---
 libdimensionxx/dimensionxx/scene.hpp | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'libdimensionxx/dimensionxx')

diff --git a/libdimensionxx/dimensionxx/scene.hpp b/libdimensionxx/dimensionxx/scene.hpp
index 73cbc2e..acb2cb1 100644
--- a/libdimensionxx/dimensionxx/scene.hpp
+++ b/libdimensionxx/dimensionxx/scene.hpp
@@ -25,7 +25,7 @@
 
 namespace Dimension
 {
-  // Iterator class for scene objects
+  // Iterator class for scene objects - never invalidated unless removed
   class Scene_Iterator;
 
   // Base scene class.  Wraps a dmnsn_scene*.
@@ -55,6 +55,7 @@ namespace Dimension
     Iterator end();
 
     void push_object(Object& object);
+    void remove_object(Iterator i);
 
     // Access the wrapped C object.
     dmnsn_scene*       dmnsn();
@@ -72,8 +73,10 @@ namespace Dimension
 
   class Scene_Iterator
   {
+    typedef std::list<std::tr1::shared_ptr<Object> >::iterator Iterator;
+
   public:
-    Scene_Iterator(std::list<std::tr1::shared_ptr<Object> >::iterator i)
+    Scene_Iterator(Iterator i)
       : m_i(i) { }
     // Scene_Iterator(const Scene_Iterator& i);
     // ~Scene_Iterator();
@@ -91,8 +94,10 @@ namespace Dimension
     Scene_Iterator& operator--()    { --m_i; return *this; }
     Scene_Iterator  operator--(int) { return Scene_Iterator(m_i--); }
 
+    Iterator iterator() const { return m_i; }
+
   private:
-    std::list<std::tr1::shared_ptr<Object> >::iterator m_i;
+    Iterator m_i;
   };
 }
 
-- 
cgit v1.2.3