Re: Status of kdelibs
Adriaan de Groot <[email protected]>
| Newsgroups | gmane.comp.kde.solaris |
|---|---|
| Message-ID | <[email protected]> |
On Tuesday 21 August 2007, Adriaan de Groot wrote:
> 2) Workaround missing parts of STL.
Patch was bad, fixed one attached. The remaining errors in kdelibs except for
the internal compiler errors have been fixed as well in SVN, so we're
theoretically good to go.
--
These are your friends - Adem
GPG: FEA2 A3FE Adriaan de Groot
___________________________________________________
This message is from the kde-solaris mailing list.
Account management: https://mail.kde.org/mailman/listinfo/kde-solaris.
Archives: http://lists.kde.org/.
More info: http://www.kde.org/faq.html.
2-kjs-wtf.diff
(text/x-diff, 2.3 KB)
Index: kjs/wtf/HashSet.h
===================================================================
--- kjs/wtf/HashSet.h (revision 701955)
+++ kjs/wtf/HashSet.h (working copy)
@@ -265,7 +265,12 @@
{
const bool canReplaceDeletedValue = !ValueTraits::needsDestruction || StorageTraits::needsDestruction;
typedef HashSetTranslator<canReplaceDeletedValue, ValueType, StorageTraits, HashFunctions> Translator;
- return m_impl.template add<ValueType, ValueType, Translator>(value, value);
+#if COMPILER(SUNPRO)
+ std::pair<HashTableType::iterator,bool> p = m_impl.template add<ValueType, ValueType, Translator>(value, value);
+ return std::make_pair(iterator(p.first),p.second);
+#else
+ return m_impl.template add<ValueType, ValueType, Translator>(value, value);
+#endif
}
template<typename Value, typename HashFunctions, typename Traits>
@@ -275,7 +280,12 @@
{
const bool canReplaceDeletedValue = !ValueTraits::needsDestruction || StorageTraits::needsDestruction;
typedef HashSetTranslatorAdapter<canReplaceDeletedValue, ValueType, StorageTraits, T, Translator> Adapter;
+#if COMPILER(SUNPRO)
+ std::pair<HashTableType::iterator,bool> p = m_impl.template add<T, T, Adapter>(value, value);
+ return std::make_pair(iterator(p.first),p.second);
+#else
return m_impl.template add<T, T, Adapter>(value, value);
+#endif
}
template<typename T, typename U, typename V>
Index: kjs/wtf/HashMap.h
===================================================================
--- kjs/wtf/HashMap.h (revision 701955)
+++ kjs/wtf/HashMap.h (working copy)
@@ -260,7 +260,12 @@
{
const bool canReplaceDeletedKey = !KeyTraits::needsDestruction || KeyStorageTraits::needsDestruction;
typedef HashMapTranslator<canReplaceDeletedKey, ValueType, ValueStorageTraits, HashFunctions> TranslatorType;
- return m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
+#if COMPILER(SUNPRO)
+ std::pair<HashTableType::iterator,bool> p = m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
+ return std::make_pair(iterator(p.first),p.second);
+#else
+ return m_impl.template add<KeyType, MappedType, TranslatorType>(key, mapped);
+#endif
}
template<typename T, typename U, typename V, typename W, typename X>
signature.asc
(application/pgp-signature, 187 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.7 (FreeBSD) iD8DBQBGyjAqdqzuAf6io/4RAvbUAKCZ+wgWz7qnzr42l2XA2EZvTsbHpwCeNxkZ FEkC5KMvmTFbeZD2GeQDABs= =VEh7 -----END PGP SIGNATURE-----