[macruby-changes] [4257] MacRuby/trunk

[source_changes at macosforge.org]

Revision: 4257
          http://trac.macosforge.org/projects/ruby/changeset/4257
Author:   lsansonetti at apple.com
Date:     2010-06-21 15:12:21 -0700 (Mon, 21 Jun 2010)
Log Message:
-----------
fix some clang/clang++ compilation warnings

Modified Paths:
--------------
    MacRuby/trunk/NSString.m
    MacRuby/trunk/vm.cpp

Modified: MacRuby/trunk/NSString.m
===================================================================
--- MacRuby/trunk/NSString.m	2010-06-20 07:52:34 UTC (rev 4256)
+++ MacRuby/trunk/NSString.m	2010-06-21 22:12:21 UTC (rev 4257)
@@ -312,11 +312,21 @@
     rb_objc_define_method(rb_cString, "include?", nsstr_include, 1);
 
 #define pick_forwarder(arity, bang) \
-    (arity == -1 ? (bang ? nsstr_forward_bang_m1 : nsstr_forward_m1)  \
-     : (arity == 0) ? (bang ? nsstr_forward_bang_0 : nsstr_forward_0) \
-     : (arity == 1) ? (bang ? nsstr_forward_bang_1 : nsstr_forward_1) \
-     : (arity == 2) ? (bang ? nsstr_forward_bang_2 : nsstr_forward_2) \
-     : (arity == 3) ? (bang ? nsstr_forward_bang_3 : nsstr_forward_3) \
+    (arity == -1 \
+	? (bang \
+	    ? (void *)nsstr_forward_bang_m1 : (void *)nsstr_forward_m1)  \
+     : (arity == 0) \
+	? (bang \
+	    ? (void *)nsstr_forward_bang_0 : (void *)nsstr_forward_0) \
+     : (arity == 1) \
+	? (bang \
+	    ? (void *)nsstr_forward_bang_1 : (void *)nsstr_forward_1) \
+     : (arity == 2) \
+	? (bang \
+	    ? (void *)nsstr_forward_bang_2 : (void *)nsstr_forward_2) \
+     : (arity == 3) \
+	? (bang \
+	    ? (void *)nsstr_forward_bang_3 : (void *)nsstr_forward_3) \
      : (abort(),NULL))
 
 #define forward(msg, arity) \

Modified: MacRuby/trunk/vm.cpp
===================================================================
--- MacRuby/trunk/vm.cpp	2010-06-20 07:52:34 UTC (rev 4256)
+++ MacRuby/trunk/vm.cpp	2010-06-21 22:12:21 UTC (rev 4257)
@@ -142,7 +142,7 @@
 class RoxorJITManager : public JITMemoryManager, public JITEventListener {
     private:
         JITMemoryManager *mm;
-	std::vector<struct RoxorFunction *> functions;
+	std::vector<RoxorFunction *> functions;
 
 	RoxorFunction *current_function(void) {
 	    assert(!functions.empty());
@@ -164,7 +164,7 @@
 	     if (addr < front->start || addr > back->end) {
 		return NULL;
 	     }
-	     std::vector<struct RoxorFunction *>::iterator iter = 
+	     std::vector<RoxorFunction *>::iterator iter = 
 		 functions.begin();
 	     while (iter != functions.end()) {
 		RoxorFunction *f = *iter;
@@ -177,7 +177,7 @@
 	}
 
 	RoxorFunction *delete_function(Function *func) {
-	    std::vector<struct RoxorFunction *>::iterator iter = 
+	    std::vector<RoxorFunction *>::iterator iter = 
 		functions.begin();
 	    while (iter != functions.end()) {
 		RoxorFunction *f = *iter;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20100621/33f11f7c/attachment.html>