Merge pull request #26192 from gottesmm/pr-c08ae1abeba47206bc05b6bd5f09f221128960cb

drodriguez · web-flow · commit b479db0b22a6 · 2019-07-17T15:43:49.000-07:00
Remove constexpr to satisfy MSVC being what it is.
diff --git a/include/swift/Strings.h b/include/swift/Strings.h
@@ -54,7 +54,8 @@ struct BuiltinNameStringLiteral {
   const StringLiteral literal;
 
   constexpr operator StringRef() const { return literal; }
-  constexpr const StringRef getWithoutPrefix() const {
+
+  StringRef getWithoutPrefix() const {
     return literal.drop_front(BUILTIN_TYPE_NAME_PREFIX.size());
   }
 };

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ struct BuiltinNameStringLiteral {`
`54`	`54`	`const StringLiteral literal;`
`55`	`55`
`56`	`56`	`constexpr operator StringRef() const { return literal; }`
`57`		`- constexpr const StringRef getWithoutPrefix() const {`
	`57`	`+`
	`58`	`+ StringRef getWithoutPrefix() const {`
`58`	`59`	`return literal.drop_front(BUILTIN_TYPE_NAME_PREFIX.size());`
`59`	`60`	`}`
`60`	`61`	`};`