Merge pull request wuye9036#35 from Praying/master

vczh · web-flow · commit 355e75bf4d45 · 2018-10-30T06:52:29.000-07:00
small fixes
diff --git a/ReadMe.md b/ReadMe.md
@@ -2106,7 +2106,7 @@ void foo(T t, typename U::type u) {
 }
 
 void callFoo() {
-  foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == int
+  foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == float
 }
 ```
 
@@ -2127,7 +2127,7 @@ void foo(T t, typename U::type u) {
 }
 
 void callFoo() {
-  foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == int
+  foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == float
   foo<int, Y>(5, 5.0); // ???
 }
 ```
@@ -2165,7 +2165,7 @@ void foo(T t, typename U::type2 u) {
   // ...
 } 
 void callFoo() {
-  foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == int
+  foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == float
   foo<int, Y>( 1, 1.0 ); // ???
 }
 ```
@@ -2511,7 +2511,7 @@ void doSomething() {
 template <typename ArgT> void foo(ArgT&& a);
 ```
 
-加入我们要限定ArgT只能是 float 的衍生类型，那么写成下面这个样子是不对的，它实际上只能接受 float 的右值引用。
+假如我们要限定ArgT只能是 float 的衍生类型，那么写成下面这个样子是不对的，它实际上只能接受 float 的右值引用。
 
 ```C++
 void foo(float&& a);

Original file line number	Diff line number	Diff line change
`@@ -2106,7 +2106,7 @@ void foo(T t, typename U::type u) {`
`2106`	`2106`	`}`
`2107`	`2107`
`2108`	`2108`	`void callFoo() {`
`2109`		`- foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == int`
	`2109`	`+ foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == float`
`2110`	`2110`	`}`
`2111`	`2111`	```
`2112`	`2112`
`@@ -2127,7 +2127,7 @@ void foo(T t, typename U::type u) {`
`2127`	`2127`	`}`
`2128`	`2128`
`2129`	`2129`	`void callFoo() {`
`2130`		`- foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == int`
	`2130`	`+ foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == float`
`2131`	`2131`	`foo<int, Y>(5, 5.0); // ???`
`2132`	`2132`	`}`
`2133`	`2133`	```
`@@ -2165,7 +2165,7 @@ void foo(T t, typename U::type2 u) {`
`2165`	`2165`	`// ...`
`2166`	`2166`	`}`
`2167`	`2167`	`void callFoo() {`
`2168`		`- foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == int`
	`2168`	`+ foo<int, X>(5, 5.0); // T == int, typename U::type == X::type == float`
`2169`	`2169`	`foo<int, Y>( 1, 1.0 ); // ???`
`2170`	`2170`	`}`
`2171`	`2171`	```
`@@ -2511,7 +2511,7 @@ void doSomething() {`
`2511`	`2511`	`template <typename ArgT> void foo(ArgT&& a);`
`2512`	`2512`	```
`2513`	`2513`
`2514`		`-加入我们要限定ArgT只能是 float 的衍生类型，那么写成下面这个样子是不对的，它实际上只能接受 float 的右值引用。`
	`2514`	`+假如我们要限定ArgT只能是 float 的衍生类型，那么写成下面这个样子是不对的，它实际上只能接受 float 的右值引用。`
`2515`	`2515`
`2516`	`2516`	```C++
`2517`	`2517`	`void foo(float&& a);`