[Boost-commit] svn:boost r47104 - sandbox/SOC/2008/graphs/branches/descrip

From: asutton_at_[hidden]
Date: 2008-07-05 08:10:23

Author: asutton
Date: 2008-07-05 08:10:23 EDT (Sat, 05 Jul 2008)
New Revision: 47104
URL: http://svn.boost.org/trac/boost/changeset/47104

Log:
More modifications.

Text files modified: 
   sandbox/SOC/2008/graphs/branches/descrip/containers.hpp  |    22 +++++++++++++++++++++-                  
   sandbox/SOC/2008/graphs/branches/descrip/des.cpp         |     2 +-                                      
   sandbox/SOC/2008/graphs/branches/descrip/descriptors.hpp |     2 +-                                      
   3 files changed, 23 insertions(+), 3 deletions(-)

Modified: sandbox/SOC/2008/graphs/branches/descrip/containers.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/branches/descrip/containers.hpp	(original)
+++ sandbox/SOC/2008/graphs/branches/descrip/containers.hpp	2008-07-05 08:10:23 EDT (Sat, 05 Jul 2008)
@@ -226,6 +226,23 @@
     inline typename Container::iterator
     insert(Container& c, Value const& x, multiple_associative_container_tag)
     { return c.insert(x); }
+
+
+    template <typename Container>
+    inline typename Container::iterator
+    erase(Container& c, typename Container::iterator i, sequence_tag)
+    { return c.erase(i); }
+
+    template <typename Container>
+    inline typename Container::iterator
+    erase(Container& c, typename Container::iterator i, associative_container_tag)
+    {
+        // A little weird, but preserves the semantics of the sequence erase,
+        // although this doesn't actually mean anything.
+        typename Container::iterator j = ++i;
+        c.erase(i);
+        return j;
+    }
 }
 
 template <typename Container, typename T>
@@ -233,7 +250,10 @@
 insert(Container& c, T const& x)
 { return dispatch::insert(c, x, container_category(c)); }
 
-template <typename 
+template <typename Container, typename T>
+inline typename C::iterator
+erase(Contaienr& c, typename Container::iterator i)
+{ return dispatch::erase(c, i, container_category(c)); }
 
 #if 0
 

Modified: sandbox/SOC/2008/graphs/branches/descrip/des.cpp
==============================================================================
--- sandbox/SOC/2008/graphs/branches/descrip/des.cpp	(original)
+++ sandbox/SOC/2008/graphs/branches/descrip/des.cpp	2008-07-05 08:10:23 EDT (Sat, 05 Jul 2008)
@@ -5,7 +5,7 @@
 #include <set>
 #include <map>
 
-#include "descriptor.hpp"
+#include "descriptors.hpp"
 #include "demangle.hpp"
 
 using namespace std;

Modified: sandbox/SOC/2008/graphs/branches/descrip/descriptors.hpp
==============================================================================
--- sandbox/SOC/2008/graphs/branches/descrip/descriptors.hpp	(original)
+++ sandbox/SOC/2008/graphs/branches/descrip/descriptors.hpp	2008-07-05 08:10:23 EDT (Sat, 05 Jul 2008)
@@ -3,7 +3,7 @@
 #define DESCRIPTORS_HPP
 
 // Pull the container traits.
-#include "containers.hpp"
+#include "containerss.hpp"
 
 // Some descriptors are built on blobs.
 #include "blob.hpp"