[Swig-cvs] SF.net SVN: swig:[12540] trunk

[<wsf...@us...>]

Revision: 12540
          http://swig.svn.sourceforge.net/swig/?rev=12540&view=rev
Author:   wsfulton
Date:     2011-03-15 07:30:18 +0000 (Tue, 15 Mar 2011)

Log Message:
-----------
Apply patch #3212624 fixing std::map Keys property.

Modified Paths:
--------------
    trunk/CHANGES.current
    trunk/Examples/test-suite/csharp/li_std_map_runme.cs
    trunk/Lib/csharp/std_map.i

Modified: trunk/CHANGES.current
===================================================================
--- trunk/CHANGES.current	2011-03-14 12:33:56 UTC (rev 12539)
+++ trunk/CHANGES.current	2011-03-15 07:30:18 UTC (rev 12540)
@@ -5,6 +5,9 @@
 Version 2.0.3 (in progress)
 ===========================
 
+2011-03-15: wsfulton
+	    [C#] Apply patch #3212624 fixing std::map Keys property.
+
 2011-03-14: olly
 	    [PHP] Fix handling of overloaded methods/functions where some
 	    return void and others don't - whether this worked or not depended

Modified: trunk/Examples/test-suite/csharp/li_std_map_runme.cs
===================================================================
--- trunk/Examples/test-suite/csharp/li_std_map_runme.cs	2011-03-14 12:33:56 UTC (rev 12539)
+++ trunk/Examples/test-suite/csharp/li_std_map_runme.cs	2011-03-15 07:30:18 UTC (rev 12540)
@@ -68,6 +68,7 @@
         {
             IList<string> keys = new List<string>(simap.Keys);
             IList<int> values = new List<int>(simap.Values);
+            Dictionary<string, int> check = new Dictionary<string, int>();
             if (keys.Count != collectionSize)
                 throw new Exception("Keys count test failed");
 
@@ -78,7 +79,14 @@
             {
                 if (simap[keys[i]] != values[i])
                     throw new Exception("Keys and values test failed for index " + i);
+                check.Add(keys[i], values[i]);
             }
+
+            for (int i = 0; i < collectionSize; i++)
+            {
+                if (!check.ContainsKey(i.ToString()))
+                  throw new Exception("Keys and Values ContainsKey test " + i + " failed");
+            }
         }
 
         // Add and Remove test

Modified: trunk/Lib/csharp/std_map.i
===================================================================
--- trunk/Lib/csharp/std_map.i	2011-03-14 12:33:56 UTC (rev 12539)
+++ trunk/Lib/csharp/std_map.i	2011-03-15 07:30:18 UTC (rev 12540)
@@ -269,7 +269,7 @@
 
       const key_type& get_next_key(std::map< K, T >::iterator *swigiterator) {
         std::map< K, T >::iterator iter = *swigiterator;
-        swigiterator++;
+        (*swigiterator)++;
         return (*iter).first;
       }
 


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