Skip to content

Commit 3ea8d06

Browse files
committed
Attempt to fix compilation errors on clang 8.0
1 parent b7d16ed commit 3ea8d06

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

core/YoungTab.hh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,12 @@ namespace yngtab {
137137
typedef std::random_access_iterator_tag iterator_category;
138138
};
139139

140-
140+
class const_iterator;
141+
class in_column_iterator;
142+
class in_column_const_iterator;
143+
class in_row_iterator;
144+
class in_row_const_iterator;
145+
141146
/// An iterator which stays inside a given column of a tableau.
142147
class in_column_iterator : public iterator_base {
143148
public:
@@ -167,6 +172,7 @@ namespace yngtab {
167172
unsigned int column_number, row_number;
168173
};
169174

175+
/// A const iterator which stays inside a given column of a tableau.
170176
class in_column_const_iterator : public const_iterator_base {
171177
public:
172178
in_column_const_iterator(unsigned int r, unsigned int c, const filled_tableau<T>*);
@@ -195,7 +201,6 @@ namespace yngtab {
195201
unsigned int column_number, row_number;
196202
};
197203

198-
199204
/// An iterator which stays inside a given row of a tableau.
200205
class in_row_iterator : public iterator_base {
201206
public:

core/pythoncdb/py_properties.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ namespace cadabra {
154154
{
155155
auto new_prop = new cpp_type();
156156
get_kernel_from_scope()->inject_property(new_prop, ex, param);
157-
prop = new_prop;
157+
BoundPropertyBase::prop = new_prop;
158158
}
159159

160160

@@ -180,7 +180,7 @@ namespace cadabra {
180180
template <typename PropT, typename... ParentTs>
181181
const PropT* BoundProperty<PropT, ParentTs...>::get_prop() const
182182
{
183-
return dynamic_cast<const PropT*>(prop);
183+
return dynamic_cast<const PropT*>(BoundPropertyBase::prop);
184184
}
185185

186186

0 commit comments

Comments
 (0)