PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-16 18:57:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various build fixes for host builds

Browse Source 
Former-commit-id: 2659556809
This commit is contained in:
Luke Street
2022-10-20 21:32:04 -04:00
parent 1c3d63ed98
commit 5580c42dc6
22 changed files with 13340 additions and 3438 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/rstl/map.hpp
View File

@@ -17,7 +17,6 @@ private:
typedef red_black_tree< K, value_type, 1, select1st< value_type >, Cmp, Alloc > rep_type;
public:
typedef pair< K, V > value_type;
// typedef typename rep_type::iterator iterator;
typedef typename rep_type::const_iterator const_iterator;

2
include/rstl/rc_ptr.hpp
View File

@@ -47,7 +47,7 @@ void rc_ptr< T >::ReleaseData() {
template < typename T >
class ncrc_ptr : public rc_ptr< T > {
public:
ncrc_ptr(T* ptr) : rc_ptr(ptr) {}
ncrc_ptr(T* ptr) : rc_ptr< T >(ptr) {}
};
} // namespace rstl

4
include/rstl/vector.hpp
View File

@@ -144,7 +144,7 @@ void vector< T, Alloc >::reserve(int newSize) {
if (newSize <= x8_capacity) {
return;
}
T* newData = x0_allocator.allocate2< T >(newSize);
T* newData = x0_allocator.template allocate2< T >(newSize);
uninitialized_copy(begin(), end(), newData);
destroy(xc_items, xc_items + x4_count);
x0_allocator.deallocate(xc_items);
@@ -154,7 +154,7 @@ void vector< T, Alloc >::reserve(int newSize) {
template < typename T, typename Alloc >
typename vector< T, Alloc >::iterator vector< T, Alloc >::insert(iterator it, const T& value) {
iterator::difference_type diff = it - begin(); // distance(begin(), it);
typename iterator::difference_type diff = it - begin(); // distance(begin(), it);
const_counting_iterator< T > in(&value, 0);
insert_into(it, 1, in);
return begin() + diff;