adjust inherit-base-members tests

Author: K-ballo

test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc

@@ -337,8 +337,6 @@ class derived
 | This function should be inherited by derived classes.
 | link:#base-do_base_shadowed[`do_base_shadowed`] 
 | This function should shadow the excluded_base function.
-| link:#base-do_derived_shadowed[`do_derived_shadowed`] 
-| This function should be shadowed by derived classes.
 | link:#derived-do_excluded_inherited[`do_excluded_inherited`] 
 | This function should be inherited by derived classes.
 | link:#derived-do_shadowed[`do_shadowed`] 
@@ -546,16 +544,12 @@ class protected_derived
 | This function should be inherited by derived classes.
 | link:#base-base_shadowed[`base_shadowed`] 
 | This function should shadow the excluded_base function.
-| link:#base-derived_shadowed[`derived_shadowed`] 
-| This function should be shadowed by derived classes.
 | link:#base_base-do_base_base_inherited[`do_base_base_inherited`] 
 | This function should be indirectly inherited by derived classes.
 | link:#base-do_base_inherited[`do_base_inherited`] 
 | This function should be inherited by derived classes.
 | link:#base-do_base_shadowed[`do_base_shadowed`] 
 | This function should shadow the excluded_base function.
-| link:#base-do_derived_shadowed[`do_derived_shadowed`] 
-| This function should be shadowed by derived classes.
 | link:#protected_derived-do_excluded_inherited[`do_excluded_inherited`] 
 | This function should be inherited by derived classes.
 | link:#protected_derived-do_shadowed[`do_shadowed`] 

test-files/golden-tests/config/inherit-base-members/copy-dependencies.html

@@ -424,7 +424,6 @@ <h2>Protected Member Functions</h2>
 <tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
 <td><a href="#derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
@@ -690,11 +689,9 @@ <h2>Protected Member Functions</h2>
 <td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
 <td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
 <td><a href="#protected_derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#protected_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
 <td><a href="#protected_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>

test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml

@@ -335,22 +335,6 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="KGOrnDVJV2nPDK1hlkvBm6diYXY=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="42"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be shadowed by derived classes.</text>
-        </brief>
-        <returns>
-          <text>A base class to test inheritance and shadowing</text>
-        </returns>
-      </doc>
-    </function>
     <function name="do_excluded_inherited" access="protected" id="oW3pQYXjjv2wrXIwIceF6Xd8nTA=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="16"/>
       <return>
@@ -517,22 +501,6 @@
         </returns>
       </doc>
     </function>
-    <function name="derived_shadowed" id="aYhSUMJkgCRo3AZmBb/rre04Ghg=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="35"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be shadowed by derived classes.</text>
-        </brief>
-        <returns>
-          <text>A base class to test inheritance and shadowing</text>
-        </returns>
-      </doc>
-    </function>
     <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="26"/>
       <return>
@@ -581,22 +549,6 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="KGOrnDVJV2nPDK1hlkvBm6diYXY=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="42"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be shadowed by derived classes.</text>
-        </brief>
-        <returns>
-          <text>A base class to test inheritance and shadowing</text>
-        </returns>
-      </doc>
-    </function>
     <function name="do_excluded_inherited" access="protected" id="KdkXQxu2xOfAXegJgCMmLcFq8MM=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="16"/>
       <return>

test-files/golden-tests/config/inherit-base-members/copy.adoc

@@ -359,7 +359,7 @@ class derived
 | This function should shadow the base class function.
 | link:#derived-do_base_base_inherited[`do_base_base_inherited`] 
 | This function should be indirectly inherited by derived classes.
-| link:#derived-do_derived_shadowed-0a[`do_derived_shadowed`] 
+| link:#derived-do_derived_shadowed[`do_derived_shadowed`] 
 | This function should shadow the base class function.
 | link:#derived-excluded_inherited[`excluded_inherited`] 
 | This function should be inherited by derived classes.
@@ -375,8 +375,6 @@ class derived
 | This function should be inherited by derived classes.
 | link:#derived-do_base_shadowed[`do_base_shadowed`] 
 | This function should shadow the excluded_base function.
-| link:#derived-do_derived_shadowed-0d[`do_derived_shadowed`] 
-| This function should be shadowed by derived classes.
 | link:#derived-do_excluded_inherited[`do_excluded_inherited`] 
 | This function should be inherited by derived classes.
 | link:#derived-do_shadowed[`do_shadowed`] 
@@ -478,7 +476,7 @@ do_base_base_inherited();
 
 A second‐order base class to test indirect inheritance
 
-[#derived-do_derived_shadowed-0a]
+[#derived-do_derived_shadowed]
 == link:#derived[derived]::do_derived_shadowed
 
 This function should shadow the base class function.
@@ -550,25 +548,6 @@ do_base_shadowed();
 
 A base class to test inheritance and shadowing
 
-[#derived-do_derived_shadowed-0d]
-== link:#derived[derived]::do_derived_shadowed
-
-This function should be shadowed by derived classes.
-
-=== Synopsis
-
-Declared in `<copy.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#base[base]&
-do_derived_shadowed();
-----
-
-=== Return Value
-
-A base class to test inheritance and shadowing
-
 [#derived-do_excluded_inherited]
 == link:#derived[derived]::do_excluded_inherited
 
@@ -699,9 +678,9 @@ class protected_derived
 |===
 | Name
 | Description
-| link:#protected_derived-derived_shadowed-0a[`derived_shadowed`] 
+| link:#protected_derived-derived_shadowed[`derived_shadowed`] 
 | This function should shadow the base class function.
-| link:#protected_derived-do_derived_shadowed-0e[`do_derived_shadowed`] 
+| link:#protected_derived-do_derived_shadowed[`do_derived_shadowed`] 
 | This function should shadow the base class function.
 |===
 
@@ -717,16 +696,12 @@ class protected_derived
 | This function should be inherited by derived classes.
 | link:#protected_derived-base_shadowed[`base_shadowed`] 
 | This function should shadow the excluded_base function.
-| link:#protected_derived-derived_shadowed-0f[`derived_shadowed`] 
-| This function should be shadowed by derived classes.
 | link:#protected_derived-do_base_base_inherited[`do_base_base_inherited`] 
 | This function should be indirectly inherited by derived classes.
 | link:#protected_derived-do_base_inherited[`do_base_inherited`] 
 | This function should be inherited by derived classes.
 | link:#protected_derived-do_base_shadowed[`do_base_shadowed`] 
 | This function should shadow the excluded_base function.
-| link:#protected_derived-do_derived_shadowed-06[`do_derived_shadowed`] 
-| This function should be shadowed by derived classes.
 | link:#protected_derived-do_excluded_inherited[`do_excluded_inherited`] 
 | This function should be inherited by derived classes.
 | link:#protected_derived-do_shadowed[`do_shadowed`] 
@@ -735,7 +710,7 @@ class protected_derived
 | This function should be inherited by derived classes.
 |===
 
-[#protected_derived-derived_shadowed-0a]
+[#protected_derived-derived_shadowed]
 == link:#protected_derived[protected_derived]::derived_shadowed
 
 This function should shadow the base class function.
@@ -754,7 +729,7 @@ derived_shadowed();
 
 A class that should inherit functions as protected.
 
-[#protected_derived-do_derived_shadowed-0e]
+[#protected_derived-do_derived_shadowed]
 == link:#protected_derived[protected_derived]::do_derived_shadowed
 
 This function should shadow the base class function.
@@ -830,25 +805,6 @@ base_shadowed();
 
 A base class to test inheritance and shadowing
 
-[#protected_derived-derived_shadowed-0f]
-== link:#protected_derived[protected_derived]::derived_shadowed
-
-This function should be shadowed by derived classes.
-
-=== Synopsis
-
-Declared in `<copy.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#base[base]&
-derived_shadowed();
-----
-
-=== Return Value
-
-A base class to test inheritance and shadowing
-
 [#protected_derived-do_base_base_inherited]
 == link:#protected_derived[protected_derived]::do_base_base_inherited
 
@@ -906,25 +862,6 @@ do_base_shadowed();
 
 A base class to test inheritance and shadowing
 
-[#protected_derived-do_derived_shadowed-06]
-== link:#protected_derived[protected_derived]::do_derived_shadowed
-
-This function should be shadowed by derived classes.
-
-=== Synopsis
-
-Declared in `<copy.cpp>`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#base[base]&
-do_derived_shadowed();
-----
-
-=== Return Value
-
-A base class to test inheritance and shadowing
-
 [#protected_derived-do_excluded_inherited]
 == link:#protected_derived[protected_derived]::do_excluded_inherited