joshua/libj
Archived
1
Fork 0
Code Activity

updating to ios5.1 and c++11

Browse source
This commit is contained in:
Joshua Moerman 2012-05-04 13:00:09 +02:00
parent 19ed1c2744
commit 7df873b445
3 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
J.xcodeproj/project.pbxproj
View file

@ -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;

6
J/array.h
View file

@ -13,10 +13,6 @@
#ifndef J_array_h
#define J_array_h
#include <tr1/array>
namespace std {
using tr1::array;
}
#include <array>
#endif

5
J/interpolator.h
View file

@ -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;