gcc fixes
This commit is contained in:
parent
06a91b98f5
commit
28cbc8f4a9
|
@ -16,7 +16,7 @@ namespace octa {
|
|||
|
||||
template<typename T, Size N>
|
||||
struct Array {
|
||||
using Size = Size;
|
||||
using Size = octa::Size;
|
||||
using Difference = Ptrdiff;
|
||||
using Value = T;
|
||||
using Reference = T &;
|
||||
|
|
|
@ -51,7 +51,7 @@ namespace detail {
|
|||
public:
|
||||
using Key = K;
|
||||
using Mapped = T;
|
||||
using Size = Size;
|
||||
using Size = octa::Size;
|
||||
using Difference = Ptrdiff;
|
||||
using Hasher = H;
|
||||
using KeyEqual = C;
|
||||
|
|
|
@ -483,7 +483,7 @@ private:
|
|||
|
||||
namespace detail {
|
||||
template<typename T> struct BoxIf {
|
||||
using Box = Box<T>;
|
||||
using BoxType = Box<T>;
|
||||
};
|
||||
|
||||
template<typename T> struct BoxIf<T[]> {
|
||||
|
@ -496,7 +496,7 @@ namespace detail {
|
|||
}
|
||||
|
||||
template<typename T, typename ...A>
|
||||
typename detail::BoxIf<T>::Box make_box(A &&...args) {
|
||||
typename detail::BoxIf<T>::BoxType make_box(A &&...args) {
|
||||
return Box<T>(new T(forward<A>(args)...));
|
||||
}
|
||||
|
||||
|
@ -529,7 +529,7 @@ template<> struct Allocator<const void> {
|
|||
};
|
||||
|
||||
template<typename T> struct Allocator {
|
||||
using Size = Size;
|
||||
using Size = octa::Size;
|
||||
using Difference = Ptrdiff;
|
||||
using Value = T;
|
||||
using Reference = T &;
|
||||
|
@ -566,7 +566,7 @@ template<typename T> struct Allocator {
|
|||
};
|
||||
|
||||
template<typename T> struct Allocator<const T> {
|
||||
using Size = Size;
|
||||
using Size = octa::Size;
|
||||
using Difference = Ptrdiff;
|
||||
using Value = const T;
|
||||
using Reference = const T &;
|
||||
|
|
|
@ -40,7 +40,7 @@ namespace detail {
|
|||
|
||||
public:
|
||||
using Key = T;
|
||||
using Size = Size;
|
||||
using Size = octa::Size;
|
||||
using Difference = Ptrdiff;
|
||||
using Hasher = H;
|
||||
using KeyEqual = C;
|
||||
|
|
|
@ -149,7 +149,7 @@ class StringBase {
|
|||
}
|
||||
|
||||
public:
|
||||
using Size = Size;
|
||||
using Size = octa::Size;
|
||||
using Difference = Ptrdiff;
|
||||
using Value = T;
|
||||
using Reference = T &;
|
||||
|
|
|
@ -18,14 +18,11 @@
|
|||
|
||||
namespace octa {
|
||||
|
||||
namespace detail {
|
||||
} /* namespace detail */
|
||||
|
||||
template<typename T, typename A = Allocator<T>>
|
||||
class Vector {
|
||||
using VecPair = detail::CompressedPair<AllocatorPointer<A>, A>;
|
||||
|
||||
Size p_len, p_cap;
|
||||
octa::Size p_len, p_cap;
|
||||
VecPair p_buf;
|
||||
|
||||
void insert_base(Size idx, Size n) {
|
||||
|
@ -77,7 +74,7 @@ class Vector {
|
|||
}
|
||||
|
||||
public:
|
||||
using Size = Size;
|
||||
using Size = octa::Size;
|
||||
using Difference = Ptrdiff;
|
||||
using Value = T;
|
||||
using Reference = T &;
|
||||
|
|
Loading…
Reference in a new issue