From 7df873b445b7663852fbd69e2ac579f3920ae919 Mon Sep 17 00:00:00 2001
From: Joshua Moerman <lakseru@gmail.com>
Date: Fri, 4 May 2012 13:00:09 +0200
Subject: [PATCH] updating to ios5.1 and c++11

---
 J.xcodeproj/project.pbxproj | 11 +++++++++--
 J/array.h                   |  6 +-----
 J/interpolator.h            |  5 +++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/J.xcodeproj/project.pbxproj b/J.xcodeproj/project.pbxproj
index a18e102..32f197f 100644
--- a/J.xcodeproj/project.pbxproj
+++ b/J.xcodeproj/project.pbxproj
@@ -172,6 +172,7 @@
 		4268135C140A321700CBF943 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastUpgradeCheck = 0430;
 				ORGANIZATIONNAME = Vadovas;
 			};
 			buildConfigurationList = 4268135F140A321700CBF943 /* Build configuration list for PBXProject "J" */;
@@ -210,6 +211,8 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -223,7 +226,7 @@
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -233,13 +236,15 @@
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
 				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LIBRARY = "libc++";
 				COPY_PHASE_STRIP = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_VERSION = com.apple.compilers.llvmgcc42;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 4.3;
+				IPHONEOS_DEPLOYMENT_TARGET = 5.1;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -252,6 +257,7 @@
 				GCC_DEBUGGING_SYMBOLS = full;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "J/J-Prefix.pch";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -266,6 +272,7 @@
 				GCC_DEBUGGING_SYMBOLS = full;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "J/J-Prefix.pch";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
diff --git a/J/array.h b/J/array.h
index a4e1b31..9b27a0c 100644
--- a/J/array.h
+++ b/J/array.h
@@ -13,10 +13,6 @@
 #ifndef J_array_h
 #define J_array_h
 
-#include <tr1/array>
-
-namespace std {
-	using tr1::array;
-}
+#include <array>
 
 #endif
diff --git a/J/interpolator.h b/J/interpolator.h
index c1379ab..ec70eb8 100644
--- a/J/interpolator.h
+++ b/J/interpolator.h
@@ -60,7 +60,8 @@
 #ifndef J_interpolator_h
 #define J_interpolator_h
 
-#include <tr1/functional>
+#include <functional>
+#include <cmath>
 
 namespace J {
 	
@@ -131,7 +132,7 @@ namespace interpolators {
 template <typename T, typename Time = float>
 class interpolator {
 	typedef typename interpolator_details::scalar_of<T>::type Scalar;
-	typedef std::tr1::function<Scalar (Scalar)> EaseFunction;
+	typedef std::function<Scalar (Scalar)> EaseFunction;
 
     EaseFunction ease_function;