basic wrapping of Annotations

[mussa.git] / py / stl_container_adapter.hpp

diff --git a/py/stl_container_adapter.hpp b/py/stl_container_adapter.hpp
index a2989094d234594fb8731f72ec0683f58c737d78..37f66fe64d56b7daabd11d7e12ccc1512f78dcfe 100644 (file)
--- a/py/stl_container_adapter.hpp
+++ b/py/stl_container_adapter.hpp
@@ -11,11 +11,10 @@
 
 struct IndexError : std::exception
 {
-public:
   explicit IndexError(): std::exception() {};
 };
 
-void translate(IndexError const &e);
+void translate_index_error(IndexError const &e);
 
 
 template<typename T>
@@ -75,23 +74,23 @@ public:
   explicit KeyError(): std::exception() {};
 };
 
-void translate(KeyError const &e);
+void translate_key_error(KeyError const &e);
 
 template<typename T>
 struct map_item
 {
     typedef typename T::key_type K;
     typedef typename T::mapped_type V;
-    static V& get(T const& x, K const& i)
+    static V& get(T & x, K const& i)
     {
         if( x.find(i) != x.end() ) return x[i];
         throw KeyError();
     }
-    static void set(T const& x, K const& i, V const& v)
+    static void set(T & x, K const& i, V const& v)
     {
         x[i]=v; // use map autocreation feature
     }
-    static void del(T const& x, K const& i)
+    static void del(T & x, K const& i)
     {
         if( x.find(i) != x.end() ) x.erase(i);
         else throw KeyError();
@@ -103,28 +102,28 @@ struct map_item
     static boost::python::list keys(T const& x)
     {
         boost::python::list t;
-        for(typename T::const_iterator it=x.begin; it!=x.end(); ++it)
+        for(typename T::const_iterator it=x.begin(); it!=x.end(); ++it)
           t.append(it->first);
         return t;
     }
     static boost::python::list values(T const& x)
     {
         boost::python::list t;
-        for(typename T::const_iterator it=x.begin; it!=x.end(); ++it)
+        for(typename T::const_iterator it=x.begin(); it!=x.end(); ++it)
           t.append(it->second);
         return t;
     }
     static boost::python::list items(T const& x)
     {
         boost::python::list t;
-        for(typename T::const_iterator it=x.begin; it!=x.end(); ++it)
+        for(typename T::const_iterator it=x.begin(); it!=x.end(); ++it)
           t.append(boost::python::make_tuple(it->first,it->second));
         return t;
     }
     static int index(T const& x,  K const& k)
     {
         int i=0;
-        for(typename T::const_iterator it=x.begin; it!=x.end(); ++it,++i)
+        for(typename T::const_iterator it=x.begin(); it!=x.end(); ++it,++i)
           if( it->first == k ) return i;
         return -1;
     }