mirror of
https://github.com/xomboverlord/ldc.git
synced 2026-04-07 20:39:08 +02:00
First merge of 2.064 beta.
This corresponds to DMD commit a913ce4bc59a94a022a27e390fc841f4aededffb. Doesn't build Phobos yet.
This commit is contained in:
committed by
Kai Nacke
parent
c400d180d2
commit
cb341586e3
16
gen/utils.h
16
gen/utils.h
@@ -20,26 +20,26 @@
|
||||
template<class C>
|
||||
struct ArrayIter
|
||||
{
|
||||
Array* array;
|
||||
Array<C>* array;
|
||||
size_t index;
|
||||
|
||||
ArrayIter(Array& arr, size_t idx = 0)
|
||||
ArrayIter(Array<C>& arr, size_t idx = 0)
|
||||
: array(&arr), index(idx)
|
||||
{ }
|
||||
ArrayIter(Array* arr, size_t idx = 0)
|
||||
ArrayIter(Array<C>* arr, size_t idx = 0)
|
||||
: array(arr), index(idx)
|
||||
{ assert(arr && "null array"); }
|
||||
|
||||
ArrayIter<C>& operator=(const Array& arr)
|
||||
ArrayIter<C>& operator=(const Array<C>& arr)
|
||||
{
|
||||
array = const_cast<Array*>(&arr);
|
||||
array = const_cast<Array<C>*>(&arr);
|
||||
index = 0;
|
||||
return *this;
|
||||
}
|
||||
ArrayIter<C>& operator=(const Array* arr)
|
||||
ArrayIter<C>& operator=(const Array<C>* arr)
|
||||
{
|
||||
assert(arr && "null array");
|
||||
array = const_cast<Array*>(arr);
|
||||
array = const_cast<Array<C>*>(arr);
|
||||
index = 0;
|
||||
return *this;
|
||||
}
|
||||
@@ -54,7 +54,7 @@ struct ArrayIter
|
||||
}
|
||||
|
||||
C* get() {
|
||||
return static_cast<C*>(array->data[index]);
|
||||
return (*array)[index];
|
||||
}
|
||||
C* operator->() {
|
||||
return get();
|
||||
|
||||
Reference in New Issue
Block a user