v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #23 from blandinw/ios-xcode46 

[workspaces/xcode] Make all targets build + iOS target (OSX 10.8.3 + Xcode 4.6.1)
pull/25/merge
Alexander Gessler 2013-03-31 05:59:38 -07:00
parent e39915348b 27767031e6
commit 4277413052
2 changed files with 3006 additions and 1672 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
code/BoostWorkaround/boost/tuple/tuple.hpp
View File

@ -181,7 +181,7 @@ namespace boost {
// ... and the const version // ... and the const version
template <unsigned N> template <unsigned N>
const typename detail::type_getter<T0,0,typename very_long::next_type, N>::type& get () const { const typename detail::type_getter<T0,0,typename very_long::next_type, N>::type& get () const {
return m.get<N>(); return m.template get<N>();
} }
@ -208,14 +208,14 @@ namespace boost {
template <unsigned N,typename T0,typename T1,typename T2,typename T3,typename T4> template <unsigned N,typename T0,typename T1,typename T2,typename T3,typename T4>
inline typename tuple<T0,T1,T2,T3,T4>::very_long::template type_getter<N>::type& get ( inline typename tuple<T0,T1,T2,T3,T4>::very_long::template type_getter<N>::type& get (
tuple<T0,T1,T2,T3,T4>& m) { tuple<T0,T1,T2,T3,T4>& m) {
return m.get<N>(); return m.template get<N>();
} }
// ... and the const version // ... and the const version
template <unsigned N,typename T0,typename T1,typename T2,typename T3,typename T4> template <unsigned N,typename T0,typename T1,typename T2,typename T3,typename T4>
inline const typename tuple<T0,T1,T2,T3,T4>::very_long::template type_getter<N>::type& get ( inline const typename tuple<T0,T1,T2,T3,T4>::very_long::template type_getter<N>::type& get (
const tuple<T0,T1,T2,T3,T4>& m) { const tuple<T0,T1,T2,T3,T4>& m) {
return m.get<N>(); return m.template get<N>();
} }
// Constructs a tuple with 5 elements // Constructs a tuple with 5 elements
@ -224,11 +224,11 @@ namespace boost {
const T1& t1,const T2& t2,const T3& t3,const T4& t4) { const T1& t1,const T2& t2,const T3& t3,const T4& t4) {
tuple <T0,T1,T2,T3,T4> t; tuple <T0,T1,T2,T3,T4> t;
t.get<0>() = t0; t.template get<0>() = t0;
t.get<1>() = t1; t.template get<1>() = t1;
t.get<2>() = t2; t.template get<2>() = t2;
t.get<3>() = t3; t.template get<3>() = t3;
t.get<4>() = t4; t.template get<4>() = t4;
return t; return t;
} }
@ -237,10 +237,10 @@ namespace boost {
inline tuple <T0,T1,T2,T3> make_tuple (const T0& t0, inline tuple <T0,T1,T2,T3> make_tuple (const T0& t0,
const T1& t1,const T2& t2,const T3& t3) { const T1& t1,const T2& t2,const T3& t3) {
tuple <T0,T1,T2,T3> t; tuple <T0,T1,T2,T3> t;
t.get<0>() = t0; t.template get<0>() = t0;
t.get<1>() = t1; t.template get<1>() = t1;
t.get<2>() = t2; t.template get<2>() = t2;
t.get<3>() = t3; t.template get<3>() = t3;
return t; return t;
} }
@ -249,9 +249,9 @@ namespace boost {
inline tuple <T0,T1,T2> make_tuple (const T0& t0, inline tuple <T0,T1,T2> make_tuple (const T0& t0,
const T1& t1,const T2& t2) { const T1& t1,const T2& t2) {
tuple <T0,T1,T2> t; tuple <T0,T1,T2> t;
t.get<0>() = t0; t.template get<0>() = t0;
t.get<1>() = t1; t.template get<1>() = t1;
t.get<2>() = t2; t.template get<2>() = t2;
return t; return t;
} }
@ -260,8 +260,8 @@ namespace boost {
inline tuple <T0,T1> make_tuple (const T0& t0, inline tuple <T0,T1> make_tuple (const T0& t0,
const T1& t1) { const T1& t1) {
tuple <T0,T1> t; tuple <T0,T1> t;
t.get<0>() = t0; t.template get<0>() = t0;
t.get<1>() = t1; t.template get<1>() = t1;
return t; return t;
} }
@ -269,7 +269,7 @@ namespace boost {
template <typename T0> template <typename T0>
inline tuple <T0> make_tuple (const T0& t0) { inline tuple <T0> make_tuple (const T0& t0) {
tuple <T0> t; tuple <T0> t;
t.get<0>() = t0; t.template get<0>() = t0;
return t; return t;
} }

4640
workspaces/xcode3/assimp.xcodeproj/project.pbxproj
View File

File diff suppressed because it is too large Load Diff