diff options
author | Luis Custodio <luis.custodio@gmail.com> | 2015-10-17 13:11:25 +0200 |
---|---|---|
committer | Luis Custodio <luis.custodio@gmail.com> | 2015-10-17 13:11:25 +0200 |
commit | f5873b08901bfaec3fb46518258ff9e886fd04c4 (patch) | |
tree | 62886b71c7226f0c6c4f979d61ff96c839a641a9 /c++.html.markdown | |
parent | c9348e5a82b639093f8f3eee955ffdf6fb99b5d8 (diff) | |
parent | 0e6d9f6fe9aeffc64c3adad3e4a0ee1cc0d1dd88 (diff) |
Merge branch 'master' of github.com:adambard/learnxinyminutes-docs
Diffstat (limited to 'c++.html.markdown')
-rw-r--r-- | c++.html.markdown | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/c++.html.markdown b/c++.html.markdown index 8ee964ca..2bee51dc 100644 --- a/c++.html.markdown +++ b/c++.html.markdown @@ -264,7 +264,7 @@ string retVal = tempObjectFun(); // What happens in the second line is actually: // - a string object is returned from tempObjectFun -// - a new string is constructed with the returned object as arugment to the +// - a new string is constructed with the returned object as argument to the // constructor // - the returned object is destroyed // The returned object is called a temporary object. Temporary objects are @@ -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); |