Fixes to compile under XCode 5.1.

anura-engine · Mar 15, 2014 · 18ad198 · 18ad198
1 parent bf75328
commit 18ad198
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/MacOS/Frogatto.xcodeproj/project.pbxproj b/MacOS/Frogatto.xcodeproj/project.pbxproj
@@ -1798,6 +1798,9 @@
 				WARNING_CFLAGS = (
 					"-Wno-parentheses-equality",
 					"-Wno-logical-op-parentheses",
+					"-Wno-deprecated-register",
+					"-Wno-redeclared-class-member",
+					"-Wno-constexpr-not-const",
 				);
 				WRAPPER_EXTENSION = app;
 			};
@@ -1860,6 +1863,9 @@
 				WARNING_CFLAGS = (
 					"-Wno-parentheses-equality",
 					"-Wno-logical-op-parentheses",
+					"-Wno-deprecated-register",
+					"-Wno-redeclared-class-member",
+					"-Wno-constexpr-not-const",
 				);
 				WRAPPER_EXTENSION = app;
 			};

diff --git a/src/surface_cache.cpp b/src/surface_cache.cpp
@@ -89,7 +89,7 @@ surface get_no_cache(data_blob_ptr blob)
 {
 	ASSERT_LOG(blob != NULL, "Invalid data_blob in surface::get_no_cache");
 	surface surf = surface(IMG_Load_RW(blob->get_rw_ops(), 0));
-	if(surf.get() == false || surf->w == 0) {
+	if(surf.get() == NULL || surf->w == 0) {
 		std::cerr << "failed to load image '" << (*blob)() << "': " << IMG_GetError() << "\n";
 		throw load_image_error();
 	}
@@ -131,7 +131,7 @@ surface get_no_cache(const std::string& key, std::string* full_filename)
 	}
 #endif // ANDROID
 	//std::cerr << "loading image '" << fname << "'\n";
-	if(surf.get() == false || surf->w == 0) {
+	if(surf.get() == NULL || surf->w == 0) {
 		if(key != "") {
 			std::cerr << "failed to load image '" << key << "':" << IMG_GetError() << "\n";
 		}

diff --git a/src/variant.cpp b/src/variant.cpp
@@ -1060,7 +1060,7 @@ bool variant::as_bool() const
 	case VARIANT_TYPE_CALLABLE:
 		return callable_ != NULL;
 	case VARIANT_TYPE_LIST:
-		return !list_->size() == 0;
+		return list_->size() != 0;
 	case VARIANT_TYPE_MAP:
 		return !map_->elements.empty();
 	case VARIANT_TYPE_STRING: