@@ -303,11 +303,11 @@
#if __has_include(<array>)
# define STD_ARRAY 1
# include <array>
- template<typename _Tp, size_t _Num>
+ template<typename _Tp, std::size_t _Num>
using array = std::array<_Tp, _Num>;
#elif __has_include(<tr1/array>)
# define TR1_ARRAY 1
# include <tr1/array>
- template<typename _Tp, size_t _Num>
+ template<typename _Tp, std::size_t _Num>
typedef std::tr1::array<_Tp, _Num> array;
#endif
@@ -292,12 +292,12 @@
#if __has_include(<array>)
# define STD_ARRAY 1
# include <array>
- template<typename _Tp, size_t _Num>
+ template<typename _Tp, std::size_t _Num>
using array = std::array<_Tp, _Num>;
#elif __has_include(<tr1/array>)
# define TR1_ARRAY 1
# include <tr1/array>
- template<typename _Tp, size_t _Num>
+ template<typename _Tp, std::size_t _Num>
typedef std::tr1::array<_Tp, _Num> array;
#endif
@@ -291,12 +291,12 @@
#if __has_include(<array>)
# define STD_ARRAY 1
# include <array>
- template<typename _Tp, size_t _Num>
+ template<typename _Tp, std::size_t _Num>
using array = std::array<_Tp, _Num>;
#elif __has_include(<tr1/array>)
# define TR1_ARRAY 1
# include <tr1/array>
- template<typename _Tp, size_t _Num>
+ template<typename _Tp, std::size_t _Num>
typedef std::tr1::array<_Tp, _Num> array;
#endif
@@ -2,6 +2,7 @@
#include <utility>
#include <tuple>
+#include <functional>
#define LIFT_FWD(x) std::forward<decltype(x)>(x)