Title: [201262] trunk/Source/WTF
- Revision
- 201262
- Author
- [email protected]
- Date
- 2016-05-22 15:36:16 -0700 (Sun, 22 May 2016)
Log Message
Another attempt to fix the GTK build after my previous changes.
* wtf/StdLibExtras.h:
Modified Paths
Diff
Modified: trunk/Source/WTF/ChangeLog (201261 => 201262)
--- trunk/Source/WTF/ChangeLog 2016-05-22 22:31:26 UTC (rev 201261)
+++ trunk/Source/WTF/ChangeLog 2016-05-22 22:36:16 UTC (rev 201262)
@@ -1,5 +1,11 @@
2016-05-22 Dan Bernstein <[email protected]>
+ Another attempt to fix the GTK build after my previous changes.
+
+ * wtf/StdLibExtras.h:
+
+2016-05-22 Dan Bernstein <[email protected]>
+
Tried to fix the GTK build after r201257.
* wtf/StdLibExtras.h:
Modified: trunk/Source/WTF/wtf/StdLibExtras.h (201261 => 201262)
--- trunk/Source/WTF/wtf/StdLibExtras.h 2016-05-22 22:31:26 UTC (rev 201261)
+++ trunk/Source/WTF/wtf/StdLibExtras.h 2016-05-22 22:36:16 UTC (rev 201262)
@@ -320,7 +320,7 @@
// This adds various C++14 features for versions of the STL that may not yet have them.
namespace std {
-#if __cplusplus < 201400L
+#if COMPILER(CLANG) && __cplusplus < 201400L
template<class T> struct _Unique_if {
typedef unique_ptr<T> _Single_object;
};
@@ -390,7 +390,7 @@
using WTF::safeCast;
using WTF::tryBinarySearch;
-#if __cplusplus >= 201400L
+#if !COMPILER(CLANG) || __cplusplus >= 201400L
// We normally don't want to bring in entire std namespaces, but literals are an exception.
using namespace std::literals::chrono_literals;
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
