Merge branch 'master' of https://github.com/0x8000-0000/CppCoreGuidelines into 0x8000-0000-master

10 years ago · bfcffb8561
parent 3f3d80d7ec 3876d12c63
commit bfcffb8561
1 changed files with 2 additions and 1 deletions
--- a/CppCoreGuidelines.md
+++ b/CppCoreGuidelines.md
@ -6227,7 +6227,8 @@ To make this interface useful, we must provide its implementation classes (here,
    };

 Now `Shape` is a poor example of a class with an implementation,
-but bare with us because this is just a simple example of a technique aimed at more complex hierarchies.
+but bear with us because this is just a simple example of a technique aimed at more complex hierarchies.
+

     class Impl::Circle : public Circle, public Impl::Shape {   // implementation
     publc: