Merge pull request #4067 from thomasspriggs/tas/fix_ubuntu18_optional

tautschnig · web-flow · commit 5530ca3aa3c9 · 2019-02-04T13:29:41.000Z
Avoid narrowing conversion in `optional`
diff --git a/src/nonstd/optional.hpp b/src/nonstd/optional.hpp
@@ -356,7 +356,7 @@ struct alignment_of_hack
     alignment_of_hack();
 };
 
-template <unsigned A, unsigned S>
+template <std::size_t A, std::size_t S>
 struct alignment_logic
 {
     enum { value = A < S ? A : S };

Original file line number	Diff line number	Diff line change
`@@ -356,7 +356,7 @@ struct alignment_of_hack`
`356`	`356`	`alignment_of_hack();`
`357`	`357`	`};`
`358`	`358`
`359`		`-template <unsigned A, unsigned S>`
	`359`	`+template <std::size_t A, std::size_t S>`
`360`	`360`	`struct alignment_logic`
`361`	`361`	`{`
`362`	`362`	`enum { value = A < S ? A : S };`