josh11b 3 rokov pred
rodič
commit
4192ee42a6
2 zmenil súbory, kde vykonal 4 pridanie a 4 odobranie
  1. 1 1
      docs/design/classes.md
  2. 3 3
      docs/design/generics/details.md

+ 1 - 1
docs/design/classes.md

@@ -831,7 +831,7 @@ members of the type, while methods can only be called on instances.
 #### Class functions
 #### Class functions
 
 
 A class function is like a
 A class function is like a
-[C++ static member function or method](<https://en.wikipedia.org/wiki/Static_(keyword)#Static_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
 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
 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
 after the class definition is finished. A common use is for constructor

+ 3 - 3
docs/design/generics/details.md

@@ -459,7 +459,7 @@ class Point4b {
       return {.x = a.x * v, .y = a.y * v};
       return {.x = a.x * v, .y = a.y * v};
     }
     }
   }
   }
-  alias Add = Vector.Add;  // Syntax TBD
+  alias Add = Vector.Add;
 }
 }
 
 
 // OR:
 // 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
 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
 same thing to be a conflict. For example, combining a type-of-type with itself
 gives itself, `MyTypeOfType & MyTypeOfType == MyTypeOfType`. Also, given two
 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
 **Rejected alternative:** Instead of using `&` as the combining operator, we
 considered using `+`,
 considered using `+`,