summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorven <vendethiel@hotmail.fr>2015-03-13 17:27:16 +0100
committerven <vendethiel@hotmail.fr>2015-03-13 17:27:16 +0100
commit5148227611a81647ba7cf063375f48a33bcb483d (patch)
treec160d4560fd8244f3f346db38aa07955cfde42f4
parent4562e82c016e0aa5332316e530a0a0c3150f4121 (diff)
parentc88c28058b34c84de853694eb71d402fee937168 (diff)
Merge pull request #1001 from Arnie97/patch-1
Closes #1000
-rw-r--r--c++.html.markdown8
1 files changed, 5 insertions, 3 deletions
diff --git a/c++.html.markdown b/c++.html.markdown
index 67fa054c..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