Browse Source

Fix 'implicit conversion loses integer precision' warnings on OS X

- for assignment to member vars just cast rather than change
  type as that's less intrusive. For local vars change the
  type.
Nur Monson 12 years ago
parent
commit
2330dd0443

+ 7 - 7
Core/Contents/Include/PolyObject.h

@@ -177,7 +177,7 @@ namespace Polycode {
 			entry->type = ObjectEntry::CONTAINER_ENTRY;			
 			entry->type = ObjectEntry::CONTAINER_ENTRY;			
 			entry->name = name;
 			entry->name = name;
 			children.push_back(entry);
 			children.push_back(entry);
-			length = children.size();
+			length = (int)children.size();
 			return entry;
 			return entry;
 		}
 		}
 		
 		
@@ -193,7 +193,7 @@ namespace Polycode {
 			entry->NumberVal = val;
 			entry->NumberVal = val;
 			entry->name = name;
 			entry->name = name;
 			children.push_back(entry);
 			children.push_back(entry);
-			length = children.size();			
+			length = (int)children.size();
 			return entry;			
 			return entry;			
 		}
 		}
 
 
@@ -210,7 +210,7 @@ namespace Polycode {
 			entry->intVal = val;
 			entry->intVal = val;
 			entry->name = name;
 			entry->name = name;
 			children.push_back(entry);	
 			children.push_back(entry);	
-			length = children.size();			
+			length = (int)children.size();
 			return entry;			
 			return entry;			
 		}
 		}
 		
 		
@@ -226,7 +226,7 @@ namespace Polycode {
 			entry->stringVal = val;
 			entry->stringVal = val;
 			entry->name = name;
 			entry->name = name;
 			children.push_back(entry);
 			children.push_back(entry);
-			length = children.size();			
+			length = (int)children.size();
 			return entry;			
 			return entry;			
 		}		
 		}		
 		
 		
@@ -242,7 +242,7 @@ namespace Polycode {
 			entry->stringVal = val;
 			entry->stringVal = val;
 			entry->name = name;
 			entry->name = name;
 			children.push_back(entry);
 			children.push_back(entry);
-			length = children.size();			
+			length = (int)children.size();
 			return entry;			
 			return entry;			
 		}		
 		}		
 		
 		
@@ -259,13 +259,13 @@ namespace Polycode {
 			entry->boolVal = val;
 			entry->boolVal = val;
 			entry->name = name;
 			entry->name = name;
 			children.push_back(entry);
 			children.push_back(entry);
-			length = children.size();			
+			length = (int)children.size();
 			return entry;			
 			return entry;			
 		}
 		}
 		
 		
 		ObjectEntry *addChild(ObjectEntry *entry) {
 		ObjectEntry *addChild(ObjectEntry *entry) {
 			children.push_back(entry);
 			children.push_back(entry);
-			length = children.size();			
+			length = (int)children.size();
 			return entry;			
 			return entry;			
 		}		
 		}		
 		
 		

+ 1 - 1
Core/Contents/Include/PolyScene.h

@@ -120,7 +120,7 @@ namespace Polycode {
 		bool isEnabled();		
 		bool isEnabled();		
 		void setEnabled(bool enabled);
 		void setEnabled(bool enabled);
 		
 		
-		int getNumEntities() { return entities.size(); }
+		int getNumEntities() { return (int)entities.size(); }
 		SceneEntity *getEntity(int index) { return entities[index]; }
 		SceneEntity *getEntity(int index) { return entities[index]; }
 		
 		
 		/**
 		/**

+ 2 - 2
Core/Contents/PolycodeView/Mac OS X/PolycodeView.mm

@@ -552,7 +552,7 @@
 	newEvent.keyCode = keymap[[theEvent keyCode]];	
 	newEvent.keyCode = keymap[[theEvent keyCode]];	
 	
 	
 	NSString *chars = [theEvent characters];
 	NSString *chars = [theEvent characters];
-	unsigned int numChars = [chars length];
+	NSUInteger numChars = [chars length];
 	
 	
 //	NSLog(@"CHARS: %@", [chars characterAtIndex:0]);
 //	NSLog(@"CHARS: %@", [chars characterAtIndex:0]);
 	if(numChars > 0) {
 	if(numChars > 0) {
@@ -578,7 +578,7 @@
 	newEvent.keyCode = keymap[[theEvent keyCode]];
 	newEvent.keyCode = keymap[[theEvent keyCode]];
 	
 	
 	NSString *chars = [theEvent characters];
 	NSString *chars = [theEvent characters];
-	unsigned int numChars = [chars length];
+	NSUInteger numChars = [chars length];
 	
 	
 	if(numChars > 0)
 	if(numChars > 0)
 		newEvent.unicodeChar = [chars characterAtIndex:0];
 		newEvent.unicodeChar = [chars characterAtIndex:0];