summaryrefslogtreecommitdiffhomepage
path: root/c++.html.markdown
diff options
context:
space:
mode:
authorLevi Bostian <levi.bostian@gmail.com>2015-10-12 23:19:55 -0500
committerLevi Bostian <levi.bostian@gmail.com>2015-10-12 23:19:55 -0500
commit02dc2ef90926e10dffaf591249aad1d26ef43d9e (patch)
tree65d10f39d9cf34195c2582212aef71ea3712392b /c++.html.markdown
parentc15be9b0131ac5e80e66d5c4158fed0a29f749cb (diff)
parente32eb715ef41e411da0a91b40e6e35f150a9c2eb (diff)
Merge pull request #1469 from Alters/master
[C++/en] Small inheritance clarification
Diffstat (limited to 'c++.html.markdown')
-rw-r--r--c++.html.markdown2
1 files changed, 2 insertions, 0 deletions
diff --git a/c++.html.markdown b/c++.html.markdown
index 6f4d0562..2bee51dc 100644
--- a/c++.html.markdown
+++ b/c++.html.markdown
@@ -404,6 +404,8 @@ int main() {
// Inheritance:
// This class inherits everything public and protected from the Dog class
+// as well as private but may not directly access private members/methods
+// without a public or protected method for doing so
class OwnedDog : public Dog {
void setOwner(const std::string& dogsOwner);