diff --git a/cppguide.xml b/cppguide.xml index 9a8a11b..507a569 100644 --- a/cppguide.xml +++ b/cppguide.xml @@ -4,7 +4,7 @@
-Revision 3.175 +Revision 3.178
@@ -1756,7 +1756,7 @@ Tashana LandrayGiven that Google's existing code is not exception-tolerant, the costs of using exceptions are somewhat greater than the costs in - in a new project. The conversion process would be slow and + a new project. The conversion process would be slow and error-prone. We don't believe that the available alternatives to exceptions, such as error codes and assertions, introduce a significant burden. @@ -3602,9 +3602,7 @@ Tashana Landray You shouldn't hard-code user-facing text in source, even English, so use of non-ASCII characters should be rare. However, in certain cases it is appropriate to include such words in your code. For - example, if your code parses data files from foreign - - + example, if your code parses data files from foreign sources, it may be appropriate to hard-code the non-ASCII string(s) used in those data files as delimiters. More commonly, unittest code (which does not @@ -3867,7 +3865,7 @@ Tashana Landray if (x == kBar) return new Bar();
- This is not allowed if the if statement has an
+ This is not allowed when the if statement has an
else:
-Revision 3.175 +Revision 3.178