aboutsummaryrefslogtreecommitdiff
path: root/cppguide.xml
diff options
context:
space:
mode:
authormmentovai <mmentovai@955884f1-7149-0410-9467-59e7ac3f4d80>2010-11-23 18:02:36 +0000
committermmentovai <mmentovai@955884f1-7149-0410-9467-59e7ac3f4d80>2010-11-23 18:02:36 +0000
commitdb989ec08fe5518413836641ca0ab8385bb2e2d9 (patch)
treeac1dffcee689064f38480c7b8d1b9860323dd360 /cppguide.xml
parenta51c16b542b19577a45096f5ddc4a3b2dfebb84c (diff)
downloadgoogle-styleguide-db989ec08fe5518413836641ca0ab8385bb2e2d9.tar.gz
Update C++ style guide to 3.180:
- Remove comment about naming macros like enums. - Move a bad code snippet from a CODE_SNIPPET to a BAD_CODE_SNIPPET element. Update Python style guide to 2.18: - Clarify the syntax for import statements. Update styleguide.xsl to 1.31: - Substitute underscore for apostrophe in anchor names.
Diffstat (limited to 'cppguide.xml')
-rw-r--r--cppguide.xml10
1 files changed, 6 insertions, 4 deletions
diff --git a/cppguide.xml b/cppguide.xml
index 507a569..c335fc7 100644
--- a/cppguide.xml
+++ b/cppguide.xml
@@ -4,7 +4,7 @@
<p align="right">
-Revision 3.178
+Revision 3.180
</p>
@@ -739,9 +739,11 @@ Tashana Landray
particular, initialization should be used instead of
declaration and assignment, e.g.
</p>
- <CODE_SNIPPET>
+ <BAD_CODE_SNIPPET>
int i;
i = f(); // Bad -- initialization separate from declaration.
+ </BAD_CODE_SNIPPET>
+ <CODE_SNIPPET>
int j = g(); // Good -- declaration has initialization.
</CODE_SNIPPET>
<p>
@@ -3018,7 +3020,7 @@ Tashana Landray
Please see the <a href="#Preprocessor_Macros">description of
macros</a>; in general macros should <em>not</em> be used.
However, if they are absolutely needed, then they should be
- named like enum value names with all capitals and underscores.
+ named with all capitals and underscores.
</p>
<CODE_SNIPPET>
#define ROUND(x) ...
@@ -4527,7 +4529,7 @@ Tashana Landray
<HR/>
<p align="right">
-Revision 3.178
+Revision 3.180
</p>