Skip to content

R
riscv-gcc-1
Commit b2342b54 by Jonathan Wakely
Options

boost_concept_check.h: Fix old attribute syntax. 

2004-05-17  Jonathan Wakely  <redi@gcc.gnu.org>

	* include/bits/boost_concept_check.h: Fix old attribute syntax.
	* testsuite/23_containers/map/modifiers/swap.cc: Define operator<
	to pass concept-checks.
	* testsuite/23_containers/multimap/modifiers/swap.cc: Same.
	* testsuite/23_containers/set/modifiers/swap.cc: Same.
	* testsuite/23_containers/multiset/modifiers/swap.cc: Same.

From-SVN: r81953
parent 5e806501
Showing with 31 additions and 10 deletions
libstdc++-v3/ChangeLog
2004-05-17 Jonathan Wakely <redi@gcc.gnu.org>
* include/bits/boost_concept_check.h: Fix old attribute syntax.
* testsuite/23_containers/map/modifiers/swap.cc: Define operator<
to pass concept-checks.
* testsuite/23_containers/multimap/modifiers/swap.cc: Same.
* testsuite/23_containers/set/modifiers/swap.cc: Same.
* testsuite/23_containers/multiset/modifiers/swap.cc: Same.
2004-05-16 Paolo Carlini <pcarlini@suse.de> 2004-05-16 Paolo Carlini <pcarlini@suse.de>
* include/std/std_bitset.h: Minor formatting fixes. * include/std/std_bitset.h: Minor formatting fixes.
......
libstdc++-v3/include/bits/boost_concept_check.h
...@@ -194,7 +194,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; ...@@ -194,7 +194,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
__const_constraints(__a); __const_constraints(__a);
} }
void __const_constraints(const _Tp& __a) { void __const_constraints(const _Tp& __a) {
_Tp __c(__a) _IsUnused; // require const copy constructor _Tp __c _IsUnused(__a); // require const copy constructor
const _Tp* __ptr _IsUnused = &__a; // require const address of operator const _Tp* __ptr _IsUnused = &__a; // require const address of operator
} }
_Tp __b; _Tp __b;
...@@ -205,12 +205,12 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; ...@@ -205,12 +205,12 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
struct _SGIAssignableConcept struct _SGIAssignableConcept
{ {
void __constraints() { void __constraints() {
_Tp __b(__a) _IsUnused; _Tp __b _IsUnused(__a);
__a = __a; // require assignment operator __a = __a; // require assignment operator
__const_constraints(__a); __const_constraints(__a);
} }
void __const_constraints(const _Tp& __b) { void __const_constraints(const _Tp& __b) {
_Tp __c(__b) _IsUnused; _Tp __c _IsUnused(__b);
__a = __b; // const required for argument to assignment __a = __b; // const required for argument to assignment
} }
_Tp __a; _Tp __a;
...@@ -726,9 +726,9 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; ...@@ -726,9 +726,9 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
__function_requires< _DefaultConstructibleConcept<_Sequence> >(); __function_requires< _DefaultConstructibleConcept<_Sequence> >();
_Sequence _Sequence
__c(__n) _IsUnused, __c _IsUnused(__n),
__c2(__n, __t) _IsUnused, __c2 _IsUnused(__n, __t),
__c3(__first, __last) _IsUnused; __c3 _IsUnused(__first, __last);
__c.insert(__p, __t); __c.insert(__p, __t);
__c.insert(__p, __n, __t); __c.insert(__p, __n, __t);
...@@ -845,7 +845,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; ...@@ -845,7 +845,7 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
__c.insert(__first, __last); __c.insert(__first, __last);
} }
typename _MultipleAssociativeContainer::iterator __pos _IsUnused; typename _MultipleAssociativeContainer::iterator __pos;
typename _MultipleAssociativeContainer::value_type __t; typename _MultipleAssociativeContainer::value_type __t;
typename _MultipleAssociativeContainer::value_type *__first, *__last; typename _MultipleAssociativeContainer::value_type *__first, *__last;
}; };
...@@ -888,9 +888,9 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; }; ...@@ -888,9 +888,9 @@ struct _Aux_require_same<_Tp,_Tp> { typedef _Tp _Type; };
_ReversibleContainerConcept<_SortedAssociativeContainer> >(); _ReversibleContainerConcept<_SortedAssociativeContainer> >();
_SortedAssociativeContainer _SortedAssociativeContainer
__c(__kc) _IsUnused, __c _IsUnused(__kc),
__c2(__first, __last) _IsUnused, __c2 _IsUnused(__first, __last),
__c3(__first, __last, __kc) _IsUnused; __c3 _IsUnused(__first, __last, __kc);
__p = __c.upper_bound(__k); __p = __c.upper_bound(__k);
__p = __c.lower_bound(__k); __p = __c.lower_bound(__k);
......
libstdc++-v3/testsuite/23_containers/map/modifiers/swap.cc
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
struct T { int i; }; struct T { int i; };
// T must be LessThanComparable to pass concept-checks
bool operator<(T l, T r) { return l.i < r.i; }
int swap_calls; int swap_calls;
namespace std namespace std
......
libstdc++-v3/testsuite/23_containers/multimap/modifiers/swap.cc
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
struct T { int i; }; struct T { int i; };
// T must be LessThanComparable to pass concept-checks
bool operator<(T l, T r) { return l.i < r.i; }
int swap_calls; int swap_calls;
namespace std namespace std
......
libstdc++-v3/testsuite/23_containers/multiset/modifiers/swap.cc
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
struct T { int i; }; struct T { int i; };
// T must be LessThanComparable to pass concept-checks
bool operator<(T l, T r) { return l.i < r.i; }
int swap_calls; int swap_calls;
namespace std namespace std
......
libstdc++-v3/testsuite/23_containers/set/modifiers/swap.cc
...@@ -21,6 +21,9 @@ ...@@ -21,6 +21,9 @@
struct T { int i; }; struct T { int i; };
// T must be LessThanComparable to pass concept-checks
bool operator<(T l, T r) { return l.i < r.i; }
int swap_calls; int swap_calls;
namespace std namespace std
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment