diff options
Diffstat (limited to 'googletest/docs/FAQ.md')
| -rw-r--r-- | googletest/docs/FAQ.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googletest/docs/FAQ.md b/googletest/docs/FAQ.md index 639c2509..7d1caf6a 100644 --- a/googletest/docs/FAQ.md +++ b/googletest/docs/FAQ.md @@ -54,7 +54,7 @@ Underscore (`_`) is special, as C++ reserves the following to be used by the compiler and the standard library: 1. any identifier that starts with an `_` followed by an upper-case letter, and - 1. any identifier that containers two consecutive underscores (i.e. `__`) _anywhere_ in its name. + 1. any identifier that contains two consecutive underscores (i.e. `__`) _anywhere_ in its name. User code is _prohibited_ from using such identifiers. @@ -994,7 +994,7 @@ you can use the _horrible_ hack of sniffing your executable name ## Google Test defines a macro that clashes with one defined by another library. How do I deal with that? ## In C++, macros don't obey namespaces. Therefore two libraries that -both define a macro of the same name will clash if you #include both +both define a macro of the same name will clash if you `#include` both definitions. In case a Google Test macro clashes with another library, you can force Google Test to rename its macro to avoid the conflict. |