Merge branch 'rafzi-patch-1'

Andrew Pardoe · Andrew Pardoe · commit e54a77966920 · 2016-04-24T09:54:06.000-07:00
diff --git a/CppCoreGuidelines.md b/CppCoreGuidelines.md
@@ -15415,10 +15415,10 @@ Pointers should not be used as arrays. `span` is a bounds-checked, safe alternat
     void f()
     {
         int a[5];
-        span av = a;
+        span<int> av = a;
 
-        g(a.data(), a.length());   // OK, if you have no choice
-        g1(a);                     // OK -- no decay here, instead use implicit span ctor
+        g(av.data(), av.length());   // OK, if you have no choice
+        g1(av);                      // OK -- no decay here, instead use implicit span ctor
     }
 
 ##### Enforcement

Original file line number	Diff line number	Diff line change
@@ -15415,10 +15415,10 @@ Pointers should not be used as arrays. `span` is a bounds-checked, safe alternat
`15415`	`15415`	`void f()`
`15416`	`15416`	`{`
`15417`	`15417`	`int a[5];`
`15418`		`- span av = a;`
	`15418`	`+ span<int> av = a;`
`15419`	`15419`
`15420`		`- g(a.data(), a.length()); // OK, if you have no choice`
`15421`		`- g1(a); // OK -- no decay here, instead use implicit span ctor`
	`15420`	`+ g(av.data(), av.length()); // OK, if you have no choice`
	`15421`	`+ g1(av); // OK -- no decay here, instead use implicit span ctor`
`15422`	`15422`	`}`
`15423`	`15423`
`15424`	`15424`	`##### Enforcement`