diff options
| author | Richard Linden <none@none> | 2012-04-20 19:12:24 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2012-04-20 19:12:24 -0700 |
| commit | c8bc9cca06ba33a81d4f7bb5d624519e09071d9c (patch) | |
| tree | dc63a1274ddcab367eac4104e473a3665d98f1d0 /indra/llxuixml | |
| parent | 23f7db3ceeadd9729f437ee12996e86d3a0bcff0 (diff) | |
fix for gcc builds
Diffstat (limited to 'indra/llxuixml')
| -rw-r--r-- | indra/llxuixml/llinitparam.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h index 5222d4c713..f7e5e41cae 100644 --- a/indra/llxuixml/llinitparam.h +++ b/indra/llxuixml/llinitparam.h @@ -55,13 +55,13 @@ namespace LLTypeTags template<typename ITEM, typename REST, bool NEEDS_SWAP = GreaterThan<ITEM::SORT_ORDER, REST::SORT_ORDER>::value > struct Swap { - typedef typename ITEM::Cons<REST>::value_t value_t; + typedef typename ITEM::template Cons<REST>::value_t value_t; }; template<typename ITEM, typename REST> struct Swap<ITEM, REST, true> { - typedef typename REST::Cons<Swap<ITEM, typename REST::inner_t>::value_t>::value_t value_t; + typedef typename REST::template Cons<Swap<ITEM, typename REST::inner_t>::value_t>::value_t value_t; }; template<typename T, typename SORTABLE = void> @@ -79,7 +79,7 @@ namespace LLTypeTags template<typename ITEM, typename REST, bool IS_REST_SORTABLE = IsSortable<REST>::value> struct InsertInto { - typedef typename ITEM::Cons<REST>::value_t value_t; + typedef typename ITEM::template Cons<REST>::value_t value_t; }; template<typename ITEM, typename REST> @@ -248,7 +248,7 @@ namespace LLInitParam typedef std::map<std::string, T> value_name_map_t; typedef Inaccessable name_t; typedef TypeValues<T> type_value_t; - typedef typename ParamValue<typename LLTypeTags::Sorted<T>::value_t> param_value_t; + typedef ParamValue<typename LLTypeTags::Sorted<T>::value_t> param_value_t; typedef typename param_value_t::value_t value_t; TypeValues(const typename param_value_t::value_t& val) @@ -745,7 +745,7 @@ namespace LLInitParam struct Atomic : public LLTypeTags::TypeTagBase<T, 1> { template <typename S> struct Cons { typedef Atomic<ParamValue<S> > value_t; }; - template <typename T> struct Cons<Atomic<T> > { typedef Atomic<T> value_t; }; + template <typename S> struct Cons<Atomic<S> > { typedef Atomic<S> value_t; }; }; template<typename T, typename BLOCK_T = typename IsBlock<T>::value_t > |