diff options
| author | Zachary Ferguson <zfergus2@users.noreply.github.com> | 2015-10-15 14:48:59 -0400 |
|---|---|---|
| committer | Zachary Ferguson <zfergus2@users.noreply.github.com> | 2015-10-15 14:48:59 -0400 |
| commit | 65bb71f4bde383a4d0b8cd6fd49901bb6e2cfa5f (patch) | |
| tree | 03802f50ac31b295ace0585ccb6bc1ea6ef9b612 /c++.html.markdown | |
| parent | a4ea3961744c3c1ee6fcf654f011caa8dbadf56e (diff) | |
| parent | 68953bd9d97328b8660dad06edd8acb8ff330ede (diff) | |
Merge remote-tracking branch 'refs/remotes/adambard/master'
Conflicts:
c.html.markdown
Diffstat (limited to 'c++.html.markdown')
| -rw-r--r-- | c++.html.markdown | 2 |
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); |