diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/stdapis/stlportv5/stl/concept_checks.h --- a/epoc32/include/stdapis/stlportv5/stl/concept_checks.h Wed Mar 31 12:27:01 2010 +0100 +++ b/epoc32/include/stdapis/stlportv5/stl/concept_checks.h Wed Mar 31 12:33:34 2010 +0100 @@ -258,7 +258,7 @@ template struct _STL_SAME_TYPE_ERROR { static void - __type_X_not_same_as_type_Y(_TypeX , _TypeY ) { + __type_X_not_same_as_type_Y(_TypeX , _TypeY ) { __check_equal<_TypeX> t1 = __check_equal<_TypeY>(); } }; @@ -303,7 +303,7 @@ struct _STL_BINARY_FUNCTION_ERROR { static _Ret __binary_function_requirement_violation(_Func& __f, - const _First& __first, + const _First& __first, const _Second& __second) { return __f(__first, __second); } @@ -313,7 +313,7 @@ struct _STL_BINARY_FUNCTION_ERROR<_Func, void, _First, _Second> { static void __binary_function_requirement_violation(_Func& __f, - const _First& __first, + const _First& __first, const _Second& __second) { __f(__first, __second); } @@ -378,14 +378,14 @@ } template static _Type - __const_parameter_required_for_copy_constructor(_Type /* __a */, + __const_parameter_required_for_copy_constructor(_Type /* __a */, const _Type& __b) { _Type __c(__b); return __c; } template static _Type - __const_parameter_required_for_assignment_operator(_Type __a, + __const_parameter_required_for_assignment_operator(_Type __a, const _Type& __b) { __a = __b; return __a; @@ -440,7 +440,7 @@ } template static _Iterator - __iterator_addition_assignment_requirement_violation(_Iterator __i, + __iterator_addition_assignment_requirement_violation(_Iterator __i, _Distance __n) { __i += __n; return __i; @@ -494,30 +494,30 @@ template struct iterator_traits; _STLP_END_NAMESPACE -template +template struct __value_type_type_definition_requirement_violation { typedef typename __STD::iterator_traits<_Iter>::value_type value_type; }; -template +template struct __difference_type_type_definition_requirement_violation { typedef typename __STD::iterator_traits<_Iter>::difference_type difference_type; }; -template +template struct __reference_type_definition_requirement_violation { typedef typename __STD::iterator_traits<_Iter>::reference reference; }; -template +template struct __pointer_type_definition_requirement_violation { typedef typename __STD::iterator_traits<_Iter>::pointer pointer; }; -template +template struct __iterator_category_type_definition_requirement_violation { - typedef typename __STD::iterator_traits<_Iter>::iterator_category + typedef typename __STD::iterator_traits<_Iter>::iterator_category iterator_category; }; @@ -708,13 +708,13 @@ // Refinement of LessThanComparable _LessThanComparable_concept_specification<_RandAccIter>:: _LessThanComparable_requirement_violation(__i); - typedef typename + typedef typename __value_type_type_definition_requirement_violation<_RandAccIter> ::value_type value_type; typedef typename __difference_type_type_definition_requirement_violation<_RandAccIter> - ::difference_type + ::difference_type _Dist; typedef typename _Mutable_trait<_Dist>::_Type _MutDist;