163a164
> struct StorageParams;
166c167
< class InfoWrap : public Base
---
> class InfoProxy : public Base
172c173
< InfoWrap(Stat &stat) : s(stat) {}
---
> InfoProxy(Stat &stat) : s(stat) {}
185c186
< class ScalarInfoBase : public Info
---
> class ScalarInfo : public Info
194c195
< class ScalarInfo : public InfoWrap<Stat, ScalarInfoBase>
---
> class ScalarInfoProxy : public InfoProxy<Stat, ScalarInfo>
197c198
< ScalarInfo(Stat &stat) : InfoWrap<Stat, ScalarInfoBase>(stat) {}
---
> ScalarInfoProxy(Stat &stat) : InfoProxy<Stat, ScalarInfo>(stat) {}
204c205
< class VectorInfoBase : public Info
---
> class VectorInfo : public Info
222c223
< class VectorInfo : public InfoWrap<Stat, VectorInfoBase>
---
> class VectorInfoProxy : public InfoProxy<Stat, VectorInfo>
229c230
< VectorInfo(Stat &stat) : InfoWrap<Stat, VectorInfoBase>(stat) {}
---
> VectorInfoProxy(Stat &stat) : InfoProxy<Stat, VectorInfo>(stat) {}
262c263
< class DistInfoBase : public Info
---
> class DistInfo : public Info
270c271
< class DistInfo : public InfoWrap<Stat, DistInfoBase>
---
> class DistInfoProxy : public InfoProxy<Stat, DistInfo>
273c274
< DistInfo(Stat &stat) : InfoWrap<Stat, DistInfoBase>(stat) {}
---
> DistInfoProxy(Stat &stat) : InfoProxy<Stat, DistInfo>(stat) {}
276c277
< class VectorDistInfoBase : public Info
---
> class VectorDistInfo : public Info
295c296
< class VectorDistInfo : public InfoWrap<Stat, VectorDistInfoBase>
---
> class VectorDistInfoProxy : public InfoProxy<Stat, VectorDistInfo>
298c299
< VectorDistInfo(Stat &stat) : InfoWrap<Stat, VectorDistInfoBase>(stat) {}
---
> VectorDistInfoProxy(Stat &stat) : InfoProxy<Stat, VectorDistInfo>(stat) {}
303c304
< class Vector2dInfoBase : public Info
---
> class Vector2dInfo : public Info
321c322
< class Vector2dInfo : public InfoWrap<Stat, Vector2dInfoBase>
---
> class Vector2dInfoProxy : public InfoProxy<Stat, Vector2dInfo>
324c325
< Vector2dInfo(Stat &stat) : InfoWrap<Stat, Vector2dInfoBase>(stat) {}
---
> Vector2dInfoProxy(Stat &stat) : InfoProxy<Stat, Vector2dInfo>(stat) {}
362c363
< template <class Derived, template <class> class InfoType>
---
> template <class Derived, template <class> class InfoProxyType>
366c367
< typedef InfoType<Derived> Info;
---
> typedef InfoProxyType<Derived> Info;
469,470c470,471
< template <class Derived, template <class> class InfoType>
< class DataWrapVec : public DataWrap<Derived, InfoType>
---
> template <class Derived, template <class> class InfoProxyType>
> class DataWrapVec : public DataWrap<Derived, InfoProxyType>
473c474
< typedef InfoType<Derived> Info;
---
> typedef InfoProxyType<Derived> Info;
545,546c546,547
< template <class Derived, template <class> class InfoType>
< class DataWrapVec2d : public DataWrapVec<Derived, InfoType>
---
> template <class Derived, template <class> class InfoProxyType>
> class DataWrapVec2d : public DataWrapVec<Derived, InfoProxyType>
549c550
< typedef InfoType<Derived> Info;
---
> typedef InfoProxyType<Derived> Info;
749c750
< class ScalarBase : public DataWrap<Derived, ScalarInfo>
---
> class ScalarBase : public DataWrap<Derived, ScalarInfoProxy>
863c864
< class ProxyInfo : public ScalarInfoBase
---
> class ProxyInfo : public ScalarInfo
903c904
< class ValueBase : public DataWrap<Derived, ScalarInfo>
---
> class ValueBase : public DataWrap<Derived, ScalarInfoProxy>
1079c1080
< class VectorBase : public DataWrapVec<Derived, VectorInfo>
---
> class VectorBase : public DataWrapVec<Derived, VectorInfoProxy>
1088c1089
< friend class DataWrapVec<Derived, VectorInfo>;
---
> friend class DataWrapVec<Derived, VectorInfoProxy>;
1298c1299
< class Vector2dBase : public DataWrapVec2d<Derived, Vector2dInfo>
---
> class Vector2dBase : public DataWrapVec2d<Derived, Vector2dInfoProxy>
1301c1302
< typedef Vector2dInfo<Derived> Info;
---
> typedef Vector2dInfoProxy<Derived> Info;
1307,1308c1308,1309
< friend class DataWrapVec<Derived, Vector2dInfo>;
< friend class DataWrapVec2d<Derived, Vector2dInfo>;
---
> friend class DataWrapVec<Derived, Vector2dInfoProxy>;
> friend class DataWrapVec2d<Derived, Vector2dInfoProxy>;
1736c1737
< class DistBase : public DataWrap<Derived, DistInfo>
---
> class DistBase : public DataWrap<Derived, DistInfoProxy>
1739c1740
< typedef DistInfo<Derived> Info;
---
> typedef DistInfoProxy<Derived> Info;
1819c1820
< class VectorDistBase : public DataWrapVec<Derived, VectorDistInfo>
---
> class VectorDistBase : public DataWrapVec<Derived, VectorDistInfoProxy>
1822c1823
< typedef VectorDistInfo<Derived> Info;
---
> typedef VectorDistInfoProxy<Derived> Info;
1827c1828
< friend class DataWrapVec<Derived, VectorDistInfo>;
---
> friend class DataWrapVec<Derived, VectorDistInfoProxy>;
2030c2031
< const ScalarInfoBase *data;
---
> const ScalarInfo *data;
2034c2035
< ScalarStatNode(const ScalarInfoBase *d) : data(d), vresult(1) {}
---
> ScalarStatNode(const ScalarInfo *d) : data(d), vresult(1) {}
2097c2098
< const VectorInfoBase *data;
---
> const VectorInfo *data;
2100c2101
< VectorStatNode(const VectorInfoBase *d) : data(d) { }
---
> VectorStatNode(const VectorInfo *d) : data(d) { }
2557c2558
< class FormulaInfoBase : public VectorInfoBase
---
> class FormulaInfo : public VectorInfo
2564c2565
< class FormulaInfo : public InfoWrap<Stat, FormulaInfoBase>
---
> class FormulaInfoProxy : public InfoProxy<Stat, FormulaInfo>
2571c2572
< FormulaInfo(Stat &stat) : InfoWrap<Stat, FormulaInfoBase>(stat) {}
---
> FormulaInfoProxy(Stat &stat) : InfoProxy<Stat, FormulaInfo>(stat) {}
2593c2594
< class Formula : public DataWrapVec<Formula, FormulaInfo>
---
> class Formula : public DataWrapVec<Formula, FormulaInfoProxy>