Fixes to get rid of warnings.

diff --git a/libs/box2d/box2d-iphone.xcodeproj/project.pbxproj b/libs/box2d/box2d-iphone.xcodeproj/project.pbxproj
index 9cd8c5d..f1e5143 100644 (file)
--- a/libs/box2d/box2d-iphone.xcodeproj/project.pbxproj
+++ b/libs/box2d/box2d-iphone.xcodeproj/project.pbxproj
@@ -64,6 +64,7 @@
                491332981372724A00DFB46D /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 491332951372724A00DFB46D /* QuartzCore.framework */; };
                49133299137272B100DFB46D /* Box2D_Prefix.pch in Headers */ = {isa = PBXBuildFile; fileRef = 491331971372653600DFB46D /* Box2D_Prefix.pch */; };
                491334921372841000DFB46D /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 491331A81372653600DFB46D /* MainWindow.xib */; };
+               4B370F111372877C00C5F46E /* Revolute.h in Headers */ = {isa = PBXBuildFile; fileRef = 4B370F101372877C00C5F46E /* Revolute.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -137,6 +138,7 @@
                491332931372724A00DFB46D /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
                491332941372724A00DFB46D /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = System/Library/Frameworks/OpenGLES.framework; sourceTree = SDKROOT; };
                491332951372724A00DFB46D /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+               4B370F101372877C00C5F46E /* Revolute.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Revolute.h; path = src/Tests/Revolute.h; sourceTree = SOURCE_ROOT; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -265,6 +267,7 @@
                                4913322713726B1F00DFB46D /* Pulleys.h */,
                                4913322813726B1F00DFB46D /* Pyramid.h */,
                                4913322913726B1F00DFB46D /* RayCast.h */,
+                               4B370F101372877C00C5F46E /* Revolute.h */,
                                4913322D13726B1F00DFB46D /* SensorTest.h */,
                                4913322E13726B1F00DFB46D /* ShapeEditing.h */,
                                4913322F13726B1F00DFB46D /* SliderCrank.h */,
@@ -329,6 +332,7 @@
                                4913326013726B1F00DFB46D /* VaryingRestitution.h in Headers */,
                                4913326113726B1F00DFB46D /* VerticalStack.h in Headers */,
                                4913326213726B1F00DFB46D /* Web.h in Headers */,
+                               4B370F111372877C00C5F46E /* Revolute.h in Headers */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/libs/box2d/iPhone/Classes/TestEntriesViewController.mm b/libs/box2d/iPhone/Classes/TestEntriesViewController.mm
index f812a59..2e016b3 100644 (file)
--- a/libs/box2d/iPhone/Classes/TestEntriesViewController.mm
+++ b/libs/box2d/iPhone/Classes/TestEntriesViewController.mm
@@ -57,7 +57,7 @@
        TestEntry* e = g_testEntries;
        e+=indexPath.row;
 
-       [cell setText:[NSString stringWithCString:e->name]];
+       [cell.textLabel setText:[NSString stringWithCString:e->name encoding:NSUTF8StringEncoding]];
     return cell;
 }
 

diff --git a/libs/box2d/src/Tests/RayCast.h b/libs/box2d/src/Tests/RayCast.h
index e3ff624..92be893 100644 (file)
--- a/libs/box2d/src/Tests/RayCast.h
+++ b/libs/box2d/src/Tests/RayCast.h
@@ -115,7 +115,7 @@ public:
                void* userData = body->GetUserData();\r
                if (userData)\r
                {\r
-                       int32 index = *(int32*)userData;\r
+                       index = *(int32*)userData;\r
                        if (index == 0)\r
                        {\r
                                // filter\r
@@ -303,7 +303,7 @@ public:
                        {\r
                                m_mode = e_multiple;\r
                        }\r
-                       else if (m_mode = e_multiple)\r
+                       else if (m_mode == e_multiple)\r
                        {\r
                                m_mode = e_closest;\r
                        }\r