From 4192ee42a6e8aab7cfa60d5d8328df83a8032790 Mon Sep 17 00:00:00 2001 From: josh11b Date: Tue, 30 Aug 2022 08:25:24 -0700 Subject: [PATCH] Misc small fixes (#2123) --- docs/design/classes.md | 2 +- docs/design/generics/details.md | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/design/classes.md b/docs/design/classes.md index 5c66afb20308..e7878f995f54 100644 --- a/docs/design/classes.md +++ b/docs/design/classes.md @@ -831,7 +831,7 @@ members of the type, while methods can only be called on instances. #### Class functions A class function is like a -[C++ static member function or method](), +[C++ static member function](https://en.cppreference.com/w/cpp/language/static#Static_member_functions), and is declared like a function at file scope. The declaration can include a definition of the function body, or that definition can be provided out of line after the class definition is finished. A common use is for constructor diff --git a/docs/design/generics/details.md b/docs/design/generics/details.md index 38f705bf5328..0942481788c7 100644 --- a/docs/design/generics/details.md +++ b/docs/design/generics/details.md @@ -459,7 +459,7 @@ class Point4b { return {.x = a.x * v, .y = a.y * v}; } } - alias Add = Vector.Add; // Syntax TBD + alias Add = Vector.Add; } // OR: @@ -1079,8 +1079,8 @@ other type-of-types, independent of order. Note that we do _not_ consider two type-of-types using the same name to mean the same thing to be a conflict. For example, combining a type-of-type with itself gives itself, `MyTypeOfType & MyTypeOfType == MyTypeOfType`. Also, given two -[interface extensions](#interface-extension) of a common base interface, the sum -should not conflict on any names in the common base. +[interface extensions](#interface-extension) of a common base interface, the +combination should not conflict on any names in the common base. **Rejected alternative:** Instead of using `&` as the combining operator, we considered using `+`,