cerc-io/solidity
11
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into breaking

Browse Source
This commit is contained in:
chriseth
2020-06-10 11:30:50 +02:00
parent 295985eca6 d2e9b4e946
commit 6b3171c38b
60 changed files with 889 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/contracts/inheritance.rst
+4 -4
View File
@@ -194,10 +194,10 @@ not known in the context of the class where it is used,
although its type is known. This is similar for ordinary
virtual method lookup.
.. _function-overriding:
.. index:: ! overriding;function
.. _function-overriding:
Function Overriding
===================
@@ -317,10 +317,10 @@ of the variable:
While public state variables can override external functions, they themselves cannot
be overridden.
.. _modifier-overriding:
.. index:: ! overriding;modifier
.. _modifier-overriding:
Modifier Overriding
===================