Merge pull request #644 from cubbimew/fix_travis

gdr-at-ms · web-flow · commit 34ff2b01936f · 2016-07-13T13:29:47.000-07:00
Fix Travis CI by reverting "Better comment for implicit conversion example"
diff --git a/CppCoreGuidelines.md b/CppCoreGuidelines.md
@@ -15422,7 +15422,7 @@ Pointers should not be used as arrays. `span` is a bounds-checked, safe alternat
         span<int> av = a;
 
         g(av.data(), av.length());   // OK, if you have no choice
-        g1(a);                       // OK -- no decay here, instead use implicit span ctor from n-dimensions static array
+        g1(a);                       // OK -- no decay here, instead use implicit span ctor
     }
 
 ##### Enforcement

Original file line number	Diff line number	Diff line change
@@ -15422,7 +15422,7 @@ Pointers should not be used as arrays. `span` is a bounds-checked, safe alternat
`15422`	`15422`	`span<int> av = a;`
`15423`	`15423`
`15424`	`15424`	`g(av.data(), av.length()); // OK, if you have no choice`
`15425`		`- g1(a); // OK -- no decay here, instead use implicit span ctor from n-dimensions static array`
	`15425`	`+ g1(a); // OK -- no decay here, instead use implicit span ctor`
`15426`	`15426`	`}`
`15427`	`15427`
`15428`	`15428`	`##### Enforcement`