[pygccxml-commit] SF.net SVN: pygccxml: [902] pyplusplus_dev

[<rom...@us...>]

Revision: 902
          http://svn.sourceforge.net/pygccxml/?rev=902&view=rev
Author:   roman_yakovenko
Date:     2007-02-11 12:59:49 -0800 (Sun, 11 Feb 2007)

Log Message:
-----------
porting indexing suite recent changes to linux

Modified Paths:
--------------
    pyplusplus_dev/indexing_suite_v2/indexing/map.hpp
    pyplusplus_dev/indexing_suite_v2/indexing/multimap.hpp
    pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp
    pyplusplus_dev/unittests/indexing_suites2_tester.py

Modified: pyplusplus_dev/indexing_suite_v2/indexing/map.hpp
===================================================================
--- pyplusplus_dev/indexing_suite_v2/indexing/map.hpp	2007-02-11 13:45:41 UTC (rev 901)
+++ pyplusplus_dev/indexing_suite_v2/indexing/map.hpp	2007-02-11 20:59:49 UTC (rev 902)
@@ -111,7 +111,7 @@
       typedef BOOST_DEDUCED_TYPENAME most_derived::container::value_type value_type;
       mapping::register_value_type< PythonClass, value_type, Policy >( pyClass );
       //now we can expose iterators functionality
-      pyClass.def( "__iter__", python::iterator< most_derived::container >() );
+      pyClass.def( "__iter__", python::iterator< BOOST_DEDUCED_TYPENAME most_derived::container >() );
     }  
   
   };

Modified: pyplusplus_dev/indexing_suite_v2/indexing/multimap.hpp
===================================================================
--- pyplusplus_dev/indexing_suite_v2/indexing/multimap.hpp	2007-02-11 13:45:41 UTC (rev 901)
+++ pyplusplus_dev/indexing_suite_v2/indexing/multimap.hpp	2007-02-11 20:59:49 UTC (rev 902)
@@ -108,7 +108,7 @@
       typedef BOOST_DEDUCED_TYPENAME most_derived::container::value_type value_type;
       mapping::register_value_type< PythonClass, value_type, Policy >( pyClass );
       //now we can expose iterators functionality
-      pyClass.def( "__iter__", python::iterator< most_derived::container >() );
+      pyClass.def( "__iter__", python::iterator< BOOST_DEDUCED_TYPENAME most_derived::container >() );
         
     }  
 
@@ -148,7 +148,8 @@
     boost::python::list _keys;
     //For some reason code with set could not be compiled
     //std::set< key_param > unique_keys;
-    for( iterator index = most_derived::begin(c); index != most_derived::end(c); ++index ){
+    typedef BOOST_DEDUCED_TYPENAME container::iterator iter_type;
+    for( iter_type index = most_derived::begin(c); index != most_derived::end(c); ++index ){
         //if( unique_keys.end() == unique_keys.find( index->first ) ){
         //    unique_keys.insert( index->first );
         if( !_keys.count( index->first ) ){

Modified: pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp
===================================================================
--- pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp	2007-02-11 13:45:41 UTC (rev 901)
+++ pyplusplus_dev/unittests/data/indexing_suites2_to_be_exported.hpp	2007-02-11 20:59:49 UTC (rev 902)
@@ -81,4 +81,8 @@
 
 }
 
+namespace pyplusplus{ namespace aliases{
+    typedef std::vector<indexing_suites2::item_t*> items_ptr_t;
+}}
+
 #endif//__indexing_suites2_to_be_exported_hpp__

Modified: pyplusplus_dev/unittests/indexing_suites2_tester.py
===================================================================
--- pyplusplus_dev/unittests/indexing_suites2_tester.py	2007-02-11 13:45:41 UTC (rev 901)
+++ pyplusplus_dev/unittests/indexing_suites2_tester.py	2007-02-11 20:59:49 UTC (rev 902)
@@ -30,7 +30,7 @@
         fvector.indexing_suite.disable_method( 'extend' )
         fvector.indexing_suite.disable_methods_group( 'reorder' )
         #fvector.indexing_suite.call_policies = module_builder.call_policies.default_call_policies()
-        items_ptr = generator.global_ns.typedef( 'items_ptr_t' )
+        items_ptr = generator.global_ns.typedefs( 'items_ptr_t' )[0]
         items_ptr = declarations.remove_declarated( items_ptr.type )
         self.failUnless( items_ptr.indexing_suite.call_policies.__class__
                          is module_builder.call_policies.return_internal_reference().__class__ )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.