From e3f23cf3d8319304d8758db19cfb8c5da398b997 Mon Sep 17 00:00:00 2001 From: albert-github Date: Sat, 5 Jan 2019 19:25:44 +0100 Subject: Double defined operator in test 74 In test 074 the operator `&=` was identically defined twice, now corrected with const. In XHTML this resulted in error: `struct_foo.xhtml:204: element a: validity error : ID aa20bd44b1bb87a652ac65170ddfa1a5a already defined` --- testing/074/namespacens.xml | 162 ++++++------- testing/074/struct_foo.xml | 577 ++++++++++++++++++++++---------------------- testing/074_ref.cpp | 3 +- 3 files changed, 373 insertions(+), 369 deletions(-) mode change 100644 => 100755 testing/074/namespacens.xml mode change 100644 => 100755 testing/074/struct_foo.xml diff --git a/testing/074/namespacens.xml b/testing/074/namespacens.xml old mode 100644 new mode 100755 index 495e550..4eccf88 --- a/testing/074/namespacens.xml +++ b/testing/074/namespacens.xml @@ -1,81 +1,81 @@ - - - - ns - - - int - int ns::operator""_op - (unsigned long long) - operator""_op - - unsigned long long - - - An operator. - - - - - - - - - int - int ns::operator""_oq - (unsigned long long) - operator""_oq - - unsigned long long - - - Another operator. - - - - - - - - - void - void ns::foo - (std::initializer_list< int * >) - foo - - std::initializer_list< int * > - - - Function. - - - - - - - - - -A namespace. - - - - - - Link to an UDL w/o spaces: operator""_op - - - Link to an UDL with spaces: operator""_oq - - - Link to a function with spaces: foo(std::initializer_list< int* >) - - - Link to a function w/o spaces: foo(std::initializer_list<int*>) - - - - - - - + + + + ns + + + int + int ns::operator""_op + (unsigned long long) + operator""_op + + unsigned long long + + + An operator. + + + + + + + + + int + int ns::operator""_oq + (unsigned long long) + operator""_oq + + unsigned long long + + + Another operator. + + + + + + + + + void + void ns::foo + (std::initializer_list< int * >) + foo + + std::initializer_list< int * > + + + Function. + + + + + + + + + + A namespace. + + + + + + Link to an UDL w/o spaces: operator""_op + + + Link to an UDL with spaces: operator""_oq + + + Link to a function with spaces: foo(std::initializer_list< int* >) + + + Link to a function w/o spaces: foo(std::initializer_list<int*>) + + + + + + + diff --git a/testing/074/struct_foo.xml b/testing/074/struct_foo.xml old mode 100644 new mode 100755 index c49fbaa..7096238 --- a/testing/074/struct_foo.xml +++ b/testing/074/struct_foo.xml @@ -1,287 +1,290 @@ - - - - Foo - - - - Foo::Foo - () - Foo - - - - Constructor - - - - - - - Foo & - Foo& Foo::operator<< - (int i) - operator<< - - int - i - - - - - overloaded less than operator - - - - - - - const Foo & - const Foo& Foo::operator<< - (int i) const - operator<< - - int - i - - - - - overloaded const less than operator - - - - - - - int - int Foo::operator() - (int i) - operator() - - int - i - - - - - overloaded call operator - - - - - - - int - int Foo::operator() - (int i) const - operator() - - int - i - - - - - overloaded call operator - - - - - - - Foo & - Foo& Foo::operator&= - (const Foo &rhs) - operator&= - - const Foo & - rhs - - - - - and equal operator - - - - - - - Foo & - Foo& Foo::operator&= - (const Foo &rhs) - operator&= - - const Foo & - rhs - - - - - and equal operator - - - - - - - int * - int* Foo::operator->* - (int *p) - operator->* - - int * - p - - - - - Member pointer operator - - - - - - - - Foo - - Foo Foo::fun - () const - fun - - Fun with itself. - - - - - - - - - - - - Foo - - static Foo Foo::fun - (Foo a, Foo b) - fun - - - Foo - - a - - - - Foo - - b - - - Fun of two. - - - - - - - fun() const - - - - - fun() const - - - - - title - - - - - - - - - - - - Foo class. - - - - - Foo::Foo() constructor for details. - - - Foo constant. - - - less than operator. - - - const less than operator. - - - call operator. - - - const call operator. - - - and equal operator. - - - member pointer operator. - - - - - - - Foo - Foo - - - Foo - fun - - - Foo - fun - - - Foo - operator&= - - - Foo - operator&= - - - Foo - operator() - - - Foo - operator() - - - Foo - operator->* - - - Foo - operator<< - - - Foo - operator<< - - - - + + + + Foo + + + + Foo::Foo + () + Foo + + + + Constructor + + + + + + + Foo & + Foo& Foo::operator<< + (int i) + operator<< + + int + i + + + + + overloaded less than operator + + + + + + + const Foo & + const Foo& Foo::operator<< + (int i) const + operator<< + + int + i + + + + + overloaded const less than operator + + + + + + + int + int Foo::operator() + (int i) + operator() + + int + i + + + + + overloaded call operator + + + + + + + int + int Foo::operator() + (int i) const + operator() + + int + i + + + + + overloaded call operator + + + + + + + Foo & + Foo& Foo::operator&= + (const Foo &rhs) + operator&= + + const Foo & + rhs + + + + + and equal operator + + + + + + + const Foo & + const Foo& Foo::operator&= + (const Foo &rhs) const + operator&= + + const Foo & + rhs + + + + + and equal operator + + + + + + + int * + int* Foo::operator->* + (int *p) + operator->* + + int * + p + + + + + Member pointer operator + + + + + + + + Foo + + Foo Foo::fun + () const + fun + + Fun with itself. + + + + + + + + + + + + Foo + + static Foo Foo::fun + (Foo a, Foo b) + fun + + + Foo + + a + + + + Foo + + b + + + Fun of two. + + + + + + + fun() const + + + + + fun() const + + + + + title + + + + + + + + + + + + Foo class. + + + + + Foo::Foo() constructor for details. + + + Foo constant. + + + less than operator. + + + const less than operator. + + + call operator. + + + const call operator. + + + and equal operator. + + + const and equal operator. + + + member pointer operator. + + + + + + + Foo + Foo + + + Foo + fun + + + Foo + fun + + + Foo + operator&= + + + Foo + operator&= + + + Foo + operator() + + + Foo + operator() + + + Foo + operator->* + + + Foo + operator<< + + + Foo + operator<< + + + + diff --git a/testing/074_ref.cpp b/testing/074_ref.cpp index d283907..cc9cf4a 100644 --- a/testing/074_ref.cpp +++ b/testing/074_ref.cpp @@ -13,6 +13,7 @@ * @see @ref operator()(int) "call operator". * @see @ref operator()(int) const "const call operator". * @see @ref operator&=(const Foo&) "and equal operator". + * @see @ref operator&=(const Foo&) const "const and equal operator". * @see @ref operator->*(int *) "member pointer operator". */ struct Foo { @@ -43,7 +44,7 @@ struct Foo { Foo& operator&=(const Foo& rhs); /** and equal operator */ - Foo& operator&=(const Foo& rhs); + const Foo& operator&=(const Foo& rhs) const; /** Member pointer operator */ int* operator->*(int *p); -- cgit v0.12