Xcode 6 / iPhone 6 compatibility updates

GPU/GLES/TransformPipeline.h

@@ -17,7 +17,14 @@
 
 #pragma once
 
+#if defined(IOS)
+#include <tr1/unordered_map>
+namespace std {
+    using std::tr1::unordered_map;
+}
+#else
 #include <unordered_map>
+#endif
 
 #include "GPU/Common/GPUDebugInterface.h"
 #include "GPU/Common/IndexGenerator.h"
@@ -219,7 +226,7 @@ private:
 	GEPrimitiveType prevPrim_;
 
 	// Cached vertex decoders
-	std::unordered_map<u32, VertexDecoder *> decoderMap_;
+    std::unordered_map<u32, VertexDecoder *> decoderMap_;
 	VertexDecoder *dec_;
 	VertexDecoderJitCache *decJitCache_;
 	u32 lastVType_;
@@ -227,7 +234,7 @@ private:
 	TransformedVertex *transformed;
 	TransformedVertex *transformedExpanded;
 
-	std::unordered_map<u32, VertexArrayInfo *> vai_;
+    std::unordered_map<u32, VertexArrayInfo *> vai_;
 
 	// Fixed index buffer for easy quad generation from spline/bezier
 	u16 *quadIndices_;

ext/xbrz/xbrz.cpp

@@ -611,7 +611,11 @@ void scalePixel(const Kernel_3x3& ker,
 
 #ifdef _DEBUG
 	if (breakIntoDebugger)
+#if defined(IOS)
+		__asm__("trap");
+#else
 		__debugbreak(); //__asm int 3;
+#endif
 #endif
 
 	const unsigned char blend = rotateBlendInfo<rotDeg>(blendInfo);