diff options
Diffstat (limited to 'c++.html.markdown')
| -rw-r--r-- | c++.html.markdown | 12 | 
1 files changed, 7 insertions, 5 deletions
| diff --git a/c++.html.markdown b/c++.html.markdown index 5f80f26f..1978d183 100644 --- a/c++.html.markdown +++ b/c++.html.markdown @@ -30,10 +30,10 @@ one of the most widely-used programming languages.  // C++ is _almost_ a superset of C and shares its basic syntax for  // variable declarations, primitive types, and functions. -// However, C++ varies in some of the following ways: -// A main() function in C++ should return an int, -// though void main() is accepted by most compilers (gcc, clang, etc.) +// Just like in C, your program's entry point is a function called +// main with an integer return type, +// though void main() is also accepted by most compilers (gcc, clang, etc.)  // This value serves as the program's exit status.  // See http://en.wikipedia.org/wiki/Exit_status for more information.  int main(int argc, char** argv) @@ -51,6 +51,8 @@ int main(int argc, char** argv)      return 0;  } +// However, C++ varies in some of the following ways: +  // In C++, character literals are one byte.  sizeof('c') == 1 @@ -492,7 +494,7 @@ bool doSomethingWithAFile(const char* filename)  {      FILE* fh = fopen(filename, "r"); // Open the file in read mode      if (fh == nullptr) // The returned pointer is null on failure. -        reuturn false; // Report that failure to the caller. +        return false; // Report that failure to the caller.      // Assume each function returns false if it failed      if (!doSomethingWithTheFile(fh)) { @@ -513,7 +515,7 @@ bool doSomethingWithAFile(const char* filename)  {      FILE* fh = fopen(filename, "r");      if (fh == nullptr) -        reuturn false; +        return false;      if (!doSomethingWithTheFile(fh))          goto failure; | 
