6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-10 20:33:15 +00:00
Code Issues Projects Releases Wiki Activity

Add missing typename's that GCC3.1 is whining about.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3051 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2002-07-24 20:22:09 +00:00
parent 60bfeb816a
commit 5a6d63ae29
2 changed files with 24 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
include/Support/Casting.h
View File

@ -71,7 +71,7 @@ struct isa_impl_cl {
template<class ToCl> template<class ToCl>
static bool isa(const FromCl &Val) { static bool isa(const FromCl &Val) {
return isa_impl_wrap<ToCl,const FromCl, return isa_impl_wrap<ToCl,const FromCl,
simplify_type<const FromCl>::SimpleType>::doit(Val); typename simplify_type<const FromCl>::SimpleType>::doit(Val);
} }
}; };
@ -153,7 +153,7 @@ struct cast_retty_wrap<To, FromTy, FromTy> {
template<class To, class From> template<class To, class From>
struct cast_retty { struct cast_retty {
typedef typename cast_retty_wrap<To, From, typedef typename cast_retty_wrap<To, From,
simplify_type<From>::SimpleType>::ret_type ret_type; typename simplify_type<From>::SimpleType>::ret_type ret_type;
}; };
// Ensure the non-simple values are converted using the simplify_type template // Ensure the non-simple values are converted using the simplify_type template
@ -161,17 +161,17 @@ struct cast_retty {
// //
template<class To, class From, class SimpleFrom> struct cast_convert_val { template<class To, class From, class SimpleFrom> struct cast_convert_val {
// This is not a simple type, use the template to simplify it... // This is not a simple type, use the template to simplify it...
static cast_retty<To, From>::ret_type doit(const From &Val) { static typename cast_retty<To, From>::ret_type doit(const From &Val) {
return cast_convert_val<To, SimpleFrom, return cast_convert_val<To, SimpleFrom,
simplify_type<SimpleFrom>::SimpleType>::doit( typename simplify_type<SimpleFrom>::SimpleType>::doit(
simplify_type<From>::getSimplifiedValue(Val)); simplify_type<From>::getSimplifiedValue(Val));
} }
}; };
template<class To, class FromTy> struct cast_convert_val<To,FromTy,FromTy> { template<class To, class FromTy> struct cast_convert_val<To,FromTy,FromTy> {
// This _is_ a simple type, just cast it. // This _is_ a simple type, just cast it.
static cast_retty<To, FromTy>::ret_type doit(const FromTy &Val) { static typename cast_retty<To, FromTy>::ret_type doit(const FromTy &Val) {
return (cast_retty<To, FromTy>::ret_type)Val; return (typename cast_retty<To, FromTy>::ret_type)Val;
} }
}; };
@ -185,16 +185,17 @@ template<class To, class FromTy> struct cast_convert_val<To,FromTy,FromTy> {
// cast<Instruction>(myVal)->getParent() // cast<Instruction>(myVal)->getParent()
// //
template <class X, class Y> template <class X, class Y>
inline cast_retty<X, Y>::ret_type cast(const Y &Val) { inline typename cast_retty<X, Y>::ret_type cast(const Y &Val) {
assert(isa<X>(Val) && "cast<Ty>() argument of uncompatible type!"); assert(isa<X>(Val) && "cast<Ty>() argument of uncompatible type!");
return cast_convert_val<X, Y, simplify_type<Y>::SimpleType>::doit(Val); return cast_convert_val<X, Y,
typename simplify_type<Y>::SimpleType>::doit(Val);
} }
// cast_or_null<X> - Functionally identical to cast, except that a null value is // cast_or_null<X> - Functionally identical to cast, except that a null value is
// accepted. // accepted.
// //
template <class X, class Y> template <class X, class Y>
inline cast_retty<X, Y*>::ret_type cast_or_null(Y *Val) { inline typename cast_retty<X, Y*>::ret_type cast_or_null(Y *Val) {
if (Val == 0) return 0; if (Val == 0) return 0;
assert(isa<X>(Val) && "cast_or_null<Ty>() argument of uncompatible type!"); assert(isa<X>(Val) && "cast_or_null<Ty>() argument of uncompatible type!");
return cast<X>(Val); return cast<X>(Val);
@ -210,7 +211,7 @@ inline cast_retty<X, Y*>::ret_type cast_or_null(Y *Val) {
// //
template <class X, class Y> template <class X, class Y>
inline cast_retty<X, Y*>::ret_type dyn_cast(Y *Val) { inline typename cast_retty<X, Y*>::ret_type dyn_cast(Y *Val) {
return isa<X>(Val) ? cast<X, Y*>(Val) : 0; return isa<X>(Val) ? cast<X, Y*>(Val) : 0;
} }
@ -218,7 +219,7 @@ inline cast_retty<X, Y*>::ret_type dyn_cast(Y *Val) {
// value is accepted. // value is accepted.
// //
template <class X, class Y> template <class X, class Y>
inline cast_retty<X, Y*>::ret_type dyn_cast_or_null(Y *Val) { inline typename cast_retty<X, Y*>::ret_type dyn_cast_or_null(Y *Val) {
return (Val && isa<X>(Val)) ? cast<X, Y*>(Val) : 0; return (Val && isa<X>(Val)) ? cast<X, Y*>(Val) : 0;
} }

23
include/llvm/Support/Casting.h
View File

@ -71,7 +71,7 @@ struct isa_impl_cl {
template<class ToCl> template<class ToCl>
static bool isa(const FromCl &Val) { static bool isa(const FromCl &Val) {
return isa_impl_wrap<ToCl,const FromCl, return isa_impl_wrap<ToCl,const FromCl,
simplify_type<const FromCl>::SimpleType>::doit(Val); typename simplify_type<const FromCl>::SimpleType>::doit(Val);
} }
}; };
@ -153,7 +153,7 @@ struct cast_retty_wrap<To, FromTy, FromTy> {
template<class To, class From> template<class To, class From>
struct cast_retty { struct cast_retty {
typedef typename cast_retty_wrap<To, From, typedef typename cast_retty_wrap<To, From,
simplify_type<From>::SimpleType>::ret_type ret_type; typename simplify_type<From>::SimpleType>::ret_type ret_type;
}; };
// Ensure the non-simple values are converted using the simplify_type template // Ensure the non-simple values are converted using the simplify_type template
@ -161,17 +161,17 @@ struct cast_retty {
// //
template<class To, class From, class SimpleFrom> struct cast_convert_val { template<class To, class From, class SimpleFrom> struct cast_convert_val {
// This is not a simple type, use the template to simplify it... // This is not a simple type, use the template to simplify it...
static cast_retty<To, From>::ret_type doit(const From &Val) { static typename cast_retty<To, From>::ret_type doit(const From &Val) {
return cast_convert_val<To, SimpleFrom, return cast_convert_val<To, SimpleFrom,
simplify_type<SimpleFrom>::SimpleType>::doit( typename simplify_type<SimpleFrom>::SimpleType>::doit(
simplify_type<From>::getSimplifiedValue(Val)); simplify_type<From>::getSimplifiedValue(Val));
} }
}; };
template<class To, class FromTy> struct cast_convert_val<To,FromTy,FromTy> { template<class To, class FromTy> struct cast_convert_val<To,FromTy,FromTy> {
// This _is_ a simple type, just cast it. // This _is_ a simple type, just cast it.
static cast_retty<To, FromTy>::ret_type doit(const FromTy &Val) { static typename cast_retty<To, FromTy>::ret_type doit(const FromTy &Val) {
return (cast_retty<To, FromTy>::ret_type)Val; return (typename cast_retty<To, FromTy>::ret_type)Val;
} }
}; };
@ -185,16 +185,17 @@ template<class To, class FromTy> struct cast_convert_val<To,FromTy,FromTy> {
// cast<Instruction>(myVal)->getParent() // cast<Instruction>(myVal)->getParent()
// //
template <class X, class Y> template <class X, class Y>
inline cast_retty<X, Y>::ret_type cast(const Y &Val) { inline typename cast_retty<X, Y>::ret_type cast(const Y &Val) {
assert(isa<X>(Val) && "cast<Ty>() argument of uncompatible type!"); assert(isa<X>(Val) && "cast<Ty>() argument of uncompatible type!");
return cast_convert_val<X, Y, simplify_type<Y>::SimpleType>::doit(Val); return cast_convert_val<X, Y,
typename simplify_type<Y>::SimpleType>::doit(Val);
} }
// cast_or_null<X> - Functionally identical to cast, except that a null value is // cast_or_null<X> - Functionally identical to cast, except that a null value is
// accepted. // accepted.
// //
template <class X, class Y> template <class X, class Y>
inline cast_retty<X, Y*>::ret_type cast_or_null(Y *Val) { inline typename cast_retty<X, Y*>::ret_type cast_or_null(Y *Val) {
if (Val == 0) return 0; if (Val == 0) return 0;
assert(isa<X>(Val) && "cast_or_null<Ty>() argument of uncompatible type!"); assert(isa<X>(Val) && "cast_or_null<Ty>() argument of uncompatible type!");
return cast<X>(Val); return cast<X>(Val);
@ -210,7 +211,7 @@ inline cast_retty<X, Y*>::ret_type cast_or_null(Y *Val) {
// //
template <class X, class Y> template <class X, class Y>
inline cast_retty<X, Y*>::ret_type dyn_cast(Y *Val) { inline typename cast_retty<X, Y*>::ret_type dyn_cast(Y *Val) {
return isa<X>(Val) ? cast<X, Y*>(Val) : 0; return isa<X>(Val) ? cast<X, Y*>(Val) : 0;
} }
@ -218,7 +219,7 @@ inline cast_retty<X, Y*>::ret_type dyn_cast(Y *Val) {
// value is accepted. // value is accepted.
// //
template <class X, class Y> template <class X, class Y>
inline cast_retty<X, Y*>::ret_type dyn_cast_or_null(Y *Val) { inline typename cast_retty<X, Y*>::ret_type dyn_cast_or_null(Y *Val) {
return (Val && isa<X>(Val)) ? cast<X, Y*>(Val) : 0; return (Val && isa<X>(Val)) ? cast<X, Y*>(Val) : 0;
} }