Title: [174399] trunk/Source/WTF
- Revision
- 174399
- Author
- ander...@apple.com
- Date
- 2014-10-07 10:15:40 -0700 (Tue, 07 Oct 2014)
Log Message
Try to fix the Mountain Lion build.
* wtf/text/StringView.h:
(WTF::StringView::underlyingStringIsValid):
(WTF::StringView::setUnderlyingString):
(WTF::StringView::invalidate):
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (174398 => 174399)
--- trunk/Source/WTF/ChangeLog 2014-10-07 16:36:00 UTC (rev 174398)
+++ trunk/Source/WTF/ChangeLog 2014-10-07 17:15:40 UTC (rev 174399)
@@ -1,5 +1,14 @@
2014-10-07 Anders Carlsson <ander...@apple.com>
+ Try to fix the Mountain Lion build.
+
+ * wtf/text/StringView.h:
+ (WTF::StringView::underlyingStringIsValid):
+ (WTF::StringView::setUnderlyingString):
+ (WTF::StringView::invalidate):
+
+2014-10-07 Anders Carlsson <ander...@apple.com>
+
Use "1", not "true".
* wtf/text/StringView.h:
Modified: trunk/Source/WTF/wtf/text/StringView.h (174398 => 174399)
--- trunk/Source/WTF/wtf/text/StringView.h 2014-10-07 16:36:00 UTC (rev 174398)
+++ trunk/Source/WTF/wtf/text/StringView.h 2014-10-07 17:15:40 UTC (rev 174399)
@@ -116,9 +116,15 @@
void initialize(const LChar*, unsigned length);
void initialize(const UChar*, unsigned length);
+#if CHECK_STRINGVIEW_LIFETIME
WTF_EXPORT_STRING_API bool underlyingStringIsValid() const;
WTF_EXPORT_STRING_API void setUnderlyingString(const StringImpl*);
WTF_EXPORT_STRING_API void setUnderlyingString(const StringView&);
+#else
+ bool underlyingStringIsValid() const { return true; }
+ void setUnderlyingString(const StringImpl*) { }
+ void setUnderlyingString(const StringView&) { }
+#endif
static const unsigned is16BitStringFlag = 1u << 31;
@@ -413,24 +419,9 @@
}
#if !CHECK_STRINGVIEW_LIFETIME
-
inline void StringView::invalidate(const StringImpl&)
{
}
-
-inline bool StringView::underlyingStringIsValid() const
-{
- return true;
-}
-
-inline void StringView::setUnderlyingString(const StringImpl*)
-{
-}
-
-inline void StringView::setUnderlyingString(const StringView&)
-{
-}
-
#endif
template<typename StringType> class StringTypeAdapter;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
