King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix bug 791236

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@130 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rani_sharoni 2003-08-21 09:12:34 +00:00
parent cb87a9bdac
commit 36a53ca896
1 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Reference/HierarchyGenerators.h
View file

@ -39,17 +39,32 @@ namespace Loki
// template 'Model' with the types contained in TList // template 'Model' with the types contained in TList
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
namespace Private
{
// The following type helps to overcome subtle flaw in the original
// implementation of GenScatterHierarchy.
// The flaw is revealed when the input type list of GenScatterHierarchy
// contains more then one element of the same type (e.g. TYPELIST_2(int, int)).
// In this case GenScatterHierarchy will contain multiple bases of the same
// type and some of them will not be reachable (per 10.3).
// For example before the fix the first element of Tuple<TYPELIST_2(int, int)>
// is not reachable in any way!
template<class, class>
struct ScatterHierarchyTag;
}
template <class TList, template <class> class Unit> template <class TList, template <class> class Unit>
class GenScatterHierarchy; class GenScatterHierarchy;
template <class T1, class T2, template <class> class Unit> template <class T1, class T2, template <class> class Unit>
class GenScatterHierarchy<Typelist<T1, T2>, Unit> class GenScatterHierarchy<Typelist<T1, T2>, Unit>
: public GenScatterHierarchy<T1, Unit> : public GenScatterHierarchy<Private::ScatterHierarchyTag<T1, T2>, Unit>
, public GenScatterHierarchy<T2, Unit> , public GenScatterHierarchy<T2, Unit>
{ {
public: public:
typedef Typelist<T1, T2> TList; typedef Typelist<T1, T2> TList;
typedef GenScatterHierarchy<T1, Unit> LeftBase; // Insure that LeftBase is unique and therefore reachable
typedef GenScatterHierarchy<Private::ScatterHierarchyTag<T1, T2>, Unit> LeftBase;
typedef GenScatterHierarchy<T2, Unit> RightBase; typedef GenScatterHierarchy<T2, Unit> RightBase;
template <typename T> struct Rebind template <typename T> struct Rebind
{ {
@ -57,6 +72,13 @@ namespace Loki
}; };
}; };
// In the middle *unique* class that resolve possible ambiguity
template <class T1, class T2, template <class> class Unit>
class GenScatterHierarchy<Private::ScatterHierarchyTag<T1, T2>, Unit>
: public GenScatterHierarchy<T1, Unit>
{
};
template <class AtomicType, template <class> class Unit> template <class AtomicType, template <class> class Unit>
class GenScatterHierarchy : public Unit<AtomicType> class GenScatterHierarchy : public Unit<AtomicType>
{ {
@ -149,7 +171,7 @@ namespace Loki
UnitType>::Result UnqualifiedResultType; UnitType>::Result UnqualifiedResultType;
typedef typename Select<isConst, const UnqualifiedResultType, typedef typename Select<isConst, const UnqualifiedResultType,
UnqualifiedResultType>::Result ResultType; UnqualifiedResultType>::Result ResultType;
static ResultType& Do(H& obj) static ResultType& Do(H& obj)
{ {
@ -179,7 +201,7 @@ namespace Loki
UnitType>::Result UnqualifiedResultType; UnitType>::Result UnqualifiedResultType;
typedef typename Select<isConst, const UnqualifiedResultType, typedef typename Select<isConst, const UnqualifiedResultType,
UnqualifiedResultType>::Result ResultType; UnqualifiedResultType>::Result ResultType;
static ResultType& Do(H& obj) static ResultType& Do(H& obj)
{ {