mirror of https://github.com/PrimeDecomp/prime.git
Improve host_cc and some code fixes
This commit is contained in:
parent
80d36b0deb
commit
bfbeaf4695
|
@ -1134,8 +1134,10 @@ else:
|
|||
description="AR $out")
|
||||
n.newline()
|
||||
|
||||
n.rule(name="host_cc", command="clang -I include/ -o $out $in",
|
||||
n.rule(name="host_cc", command="clang -I include/ -Wno-trigraphs -o $out $in",
|
||||
description="host_cc $out")
|
||||
n.rule(name="host_cpp", command="clang++ -std=c++03 -I include/ -Wno-trigraphs -o $out $in",
|
||||
description="host_c++ $out")
|
||||
n.newline()
|
||||
|
||||
###
|
||||
|
@ -1176,7 +1178,7 @@ for lib in LIBS:
|
|||
"basedir": os.path.dirname(f"$builddir/src/{object}"),
|
||||
"basefile": f"$builddir/src/{object}"
|
||||
})
|
||||
n.build(f"$builddir/host/{object}.o", "host_cc", c_file,
|
||||
n.build(f"$builddir/host/{object}.o", "host_cc" if c_file.endswith(".c") else "host_cpp", c_file,
|
||||
variables={
|
||||
"basedir": os.path.dirname(f"$builddir/src/{object}"),
|
||||
"basefile": f"$builddir/src/{object}"
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#include "rstl/reserved_vector.hpp"
|
||||
|
||||
template < typename T, int N >
|
||||
class TReservedAverage : rstl::reserved_vector< T, N > {
|
||||
class TReservedAverage : public rstl::reserved_vector< T, N > {
|
||||
public:
|
||||
TReservedAverage() {}
|
||||
TReservedAverage(const T& value) {
|
||||
|
|
|
@ -77,9 +77,9 @@ class pointer_iterator : public const_pointer_iterator< T, Vec, Alloc > {
|
|||
typedef const_pointer_iterator< T, Vec, Alloc > base;
|
||||
|
||||
public:
|
||||
typedef base::difference_type difference_type;
|
||||
typedef base::iterator_category iterator_category;
|
||||
typedef base::value_type value_type;
|
||||
typedef typename base::difference_type difference_type;
|
||||
typedef typename base::iterator_category iterator_category;
|
||||
typedef typename base::value_type value_type;
|
||||
|
||||
pointer_iterator() : const_pointer_iterator< T, Vec, Alloc >(nullptr) {}
|
||||
pointer_iterator(T* begin) : const_pointer_iterator< T, Vec, Alloc >(begin) {}
|
||||
|
|
Loading…
Reference in New Issue