[Swig-cvs] SF.net SVN: swig: [10046] trunk/Lib/ruby/rubycontainer.swg

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

Revision: 10046
          http://swig.svn.sourceforge.net/swig/?rev=10046&view=rev
Author:   wsfulton
Date:     2007-10-25 17:23:58 -0700 (Thu, 25 Oct 2007)

Log Message:
-----------
signed / unsigned mismatch fixes

Modified Paths:
--------------
    trunk/Lib/ruby/rubycontainer.swg

Modified: trunk/Lib/ruby/rubycontainer.swg
===================================================================
--- trunk/Lib/ruby/rubycontainer.swg	2007-10-25 23:52:35 UTC (rev 10045)
+++ trunk/Lib/ruby/rubycontainer.swg	2007-10-26 00:23:58 UTC (rev 10046)
@@ -652,7 +652,8 @@
 	if ( j <= 0 ) return Qnil;
 	std::size_t len = $self->size();
 	if ( i < 0 ) i = len - i;
-	j += i; if ( j >= len ) j = len-1;
+	j += i;
+	if ( static_cast<std::size_t>(j) >= len ) j = len-1;
 
 	VALUE r = Qnil;
 	try {
@@ -804,7 +805,7 @@
       if ( j <= 0 ) return Qnil;
       std::size_t len = $self->size();
       if ( i < 0 ) i = len - i;
-      j += i; if ( j >= len ) j = len-1;
+      j += i; if ( static_cast<std::size_t>(j) >= len ) j = len-1;
 
       VALUE r = Qnil;
       try {
@@ -842,7 +843,7 @@
       VALUE end   = rb_funcall( i, id_end, 0 );
       bool  noend = ( rb_funcall( i, id_noend, 0 ) == Qtrue );
 
-      std::size_t len = $self->size();
+      int len = $self->size();
 
       int s = NUM2INT( start );
       if ( s < 0 ) s = len + s;
@@ -863,7 +864,7 @@
       {
 	std::size_t len = $self->size();
 	if ( i < 0 ) i = len - i;
-	else if ( i >= len )
+	else if ( static_cast<std::size_t>(i) >= len )
 	  $self->resize( i+1, x );
 	else
 	  *(swig::getpos(self,i)) = x;
@@ -878,7 +879,7 @@
       std::size_t len = $self->size();
       if ( i < 0 ) i = len - i;
       j += i; 
-      if ( j >= len ) {
+      if ( static_cast<std::size_t>(j) >= len ) {
 	$self->resize( j+1, *(v.begin()) );
 	j = len-1;
       }


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